[feat]: Testes antigos removidos e configurado Dusk e Docker seguindo…

.env.example

@@ -1,18 +1,18 @@
-APP_NAME=Laravel
+APP_NAME=Salas
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://127.0.0.1:8000
+APP_URL=http://localhost:8000
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=salas_mariadb
 DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=salas
+DB_USERNAME=salas
+DB_PASSWORD=salas
 
 # Em produção,depende de Supervisor instalado para processar a fila.
 # Em ambiente dev, pode subir um processo com
@@ -125,3 +125,14 @@ CALENDARIO_HORA_FINAL=
 # upload_max_filesize e post_max_size
 # Definir o parâmetro em MB, o padrão aqui é 16MB (se não estiver definido valor algum)
 UPLOAD_MAX_FILESIZE=16
+
+DUSK_DRIVER_URL='http://selenium:4444/wd/hub'
+DUSK_START_MAXIMIZED=true
+DUSK_HEADLESS_DISABLED=true
+
+SENHAUNICA_KEY=faker
+SENHAUNICA_SECRET=faker
+SENHAUNICA_CALLBACK_ID=1
+SENHAUNICA_ADMINS=111111
+REPLICADO_FAKE=1
+SENHAUNICA_DEV="http://auth.local:3141/wsusuario/oauth"

.github/workflows/dusk.yml

@@ -12,7 +12,7 @@ jobs:
       mariadb:
         image: mariadb:10.11
         env:
-          MARIADB_DATABASE: salas_dusk
+          MARIADB_DATABASE: db
           MARIADB_ROOT_PASSWORD: admin
           MARIADB_USER: admin
           MARIADB_PASSWORD: admin
@@ -32,20 +32,35 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: mbstring, dom, pdo, mysql
           coverage: none
 
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Remove Dusk visual variables - usadas no modo assistido
+      # 1. Copia o .env.example direto para .env
+      - name: Copy env from example
+        run: cp .env.example .env
+
+      # 2. Remove as variáveis visuais do Dusk caso existam no .env
+      - name: Remove Dusk visual variables
         run: |
-          sed -i '/DUSK_START_MAXIMIZED/d' .env.testing.example || true
-          sed -i '/DUSK_HEADLESS_DISABLED/d' .env.testing.example || true
+          sed -i '/DUSK_START_MAXIMIZED/d' .env || true
+          sed -i '/DUSK_HEADLESS_DISABLED/d' .env || true
 
-      - name: Copy testing env
-        run: cp .env.testing.example .env
+      # 3. Injeta as configurações do Dusk e do Banco de Dados no .env gerado
+      - name: Configure .env file for testing
+        run: |
+          printf "\n" >> .env
+          echo "APP_URL=http://127.0.0.1:47800" >> .env
+          echo "DUSK_DRIVER_URL=http://localhost:9515" >> .env
+          echo "DB_CONNECTION=mysql" >> .env
+          echo "DB_HOST=127.0.0.1" >> .env
+          echo "DB_PORT=3306" >> .env
+          echo "DB_DATABASE=db" >> .env
+          echo "DB_USERNAME=admin" >> .env
+          echo "DB_PASSWORD=admin" >> .env
 
       - name: Generate APP_KEY
         run: php artisan key:generate

.gitignore

@@ -4,9 +4,9 @@
 /storage/*.key
 /vendor
 .env
+.env.dusk.local
 .env.backup
 .env.testing
-.env.dusk.local
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml

Dockerfile

@@ -1,60 +1,15 @@
-FROM php:8.3-apache
+FROM uspdev/uspdev-php-apache:8.3
 
-# packages
-RUN sed -i 's|main|main non-free|' /etc/apt/sources.list.d/debian.sources && apt-get update && apt-get install -y \
-    unixodbc \
-    unixodbc-dev \
-    freetds-bin \
-    freetds-dev \
-    libicu-dev \
-    git \
-    unzip \
-    libzip-dev \
-    libpng-dev \
-    libonig-dev \
-    libxml2-dev \
-    libjpeg-dev \
-    libpng-dev \
-    libfreetype6-dev \ 
-    curl
+RUN sed -i 's|/var/www/html|/var/www/html/public|' \
+    /etc/apache2/sites-available/000-default.conf
 
-# cleanup
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-
-# php libs
-RUN docker-php-ext-install \
-    intl \
-    pdo_mysql \
-    soap \
-    zip \
-    mbstring \
-    bcmath \
-    pdo_dblib
-
-# gd
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg && \
-    docker-php-ext-install gd
-
-# php memory
-ENV PHP_MEMORY_LIMIT=512M
-ENV PHP_UPLOAD_LIMIT=512M
-RUN { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
-    } > "${PHP_INI_DIR}/conf.d/upload.ini"
-
-# apache
-RUN a2enmod rewrite
-RUN sed -i 's|/var/www/html|/var/www/html/public|' /etc/apache2/sites-available/000-default.conf
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# composer
 USER www-data
+
 COPY --chown=www-data . .
-RUN composer install --optimize-autoloader --no-interaction
 
-CMD ["./serve.sh"]
+RUN composer install \
+    --no-dev \
+    --optimize-autoloader \
+    --no-interaction
+
+CMD ["apache2-foreground"]

composer.json

@@ -24,12 +24,12 @@
         "uspdev/senhaunica-socialite": "^4.3"
     },
     "require-dev": {
-        "spatie/laravel-ignition": "^2.4",
         "fakerphp/faker": "^1.9.1",
-        "laravel/dusk": "^8.0",
+        "laravel/dusk": "^8.6",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.0"
+        "phpunit/phpunit": "^11.0",
+        "spatie/laravel-ignition": "^2.4"
     },
     "config": {
         "optimize-autoloader": true,
@@ -62,8 +62,7 @@
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi",
-            "@php artisan vendor:publish --provider=\"Uspdev\\UspTheme\\ServiceProvider\" --tag=assets --force",
-            "@php artisan dusk:chrome-driver --detect"
+            "@php artisan vendor:publish --provider=\"Uspdev\\UspTheme\\ServiceProvider\" --tag=assets --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

docker-compose.yml

@@ -1,18 +1,18 @@
 services:
   salas:
-    build: .
+    image: salas:latest
     container_name: salas
     ports:
       - "8000:80"
     depends_on:
       - mariadb
-      - selenium
     networks:
       - salas-network
     volumes:
       - ./:/var/www/html
-      - storage_data:/var/www/html/storage
-      - cache_data:/var/www/html/bootstrap/cache
+    environment:
+      HOME: /tmp
+    user: "${UID:-1000}:${GID:-1000}"
 
   mariadb:
     image: mariadb:11
@@ -28,21 +28,29 @@ services:
     networks:
       - salas-network
 
-  # http://localhost:7900 senha: secret 
   selenium:
-    image: selenium/standalone-chrome:latest
+    image: selenium/standalone-chrome
     container_name: salas_selenium
     ports:
-      - "4444:4444" # WebDriver
-      - "7900:7900" # VNC (ver browser)
-    shm_size: 2gb
+      - "7900:7900" # VNC (pra ver o browser rodando)
     networks:
       - salas-network
+    shm_size: 2gb
+
+  senhaunica-faker:
+    image: uspdev/senhaunica-faker
+    container_name: salas_senhaunica-faker
+    ports:
+      - "3141:3141"
+    environment:
+          - APP_URL=http://auth.local:3141
+    networks:
+      salas-network:
+        aliases:
+          - auth.local
 
 networks:
   salas-network:
 
 volumes:
-  mariadb_data:
-  storage_data:
-  cache_data:
+  mariadb_data: