[FEATURE] use WebDriver acceptInsecureCertificates, enable Firefox ac…

…ceptance tests in CI (cherry picked from commit f6be8cc)
dmind-gmbh · Apr 24, 2021 · ae202fb · ae202fb
1 parent 611f14f
commit ae202fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.ddev/docker-compose.selenium.yaml b/.ddev/docker-compose.selenium.yaml
@@ -3,7 +3,7 @@ version: '3.6'
 services:
     selenium-chrome:
         container_name: ddev-${DDEV_SITENAME}-selenium-chrome
-        image: flightvision/selenium-node-chrome-with-mkcert:latest
+        image: selenium/node-chrome:3
         depends_on:
             - selenium-hub
         labels:
@@ -25,7 +25,7 @@ services:
 
     selenium-firefox:
         container_name: ddev-${DDEV_SITENAME}-selenium-firefox
-        image: flightvision/selenium-node-firefox-with-mkcert:latest
+        image: selenium/node-firefox:3
         depends_on:
             - selenium-hub
         labels:
@@ -48,7 +48,7 @@ services:
 
     selenium-hub:
         container_name: ddev-${DDEV_SITENAME}-selenium-hub
-        image: selenium/hub:3.141.59-xenon
+        image: selenium/hub:3
         labels:
             com.ddev.site-name: ${DDEV_SITENAME}
             com.ddev.platform: ddev

diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -20,6 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version: [7.4]
+        browser: [chrome, firefox]
         theme: [bootstrap3-banner, bootstrap3-modal, bootstrap4-modal, bootstrap5-modal, customtheme]
     steps:
       -   uses: actions/checkout@v2
@@ -31,10 +32,10 @@ jobs:
       # Setup tests
       -   run: ddev composer cookieman:${{ matrix.theme }}
       # Run tests
-      -   run: ddev composer test:acceptance
+      -   run: ddev composer test:acceptance:${{ matrix.browser }}
       # Save acceptance reports
       -   uses: actions/upload-artifact@master
           with:
-            name: ${{ matrix.theme }}-${{ matrix.php-version }}-ar
+            name: ${{ matrix.browser }}-${{ matrix.theme }}-${{ matrix.php-version }}-ar
             path: Build/AcceptanceReports
           if: always()
diff --git a/Build/local.codeception.yml b/Build/local.codeception.yml
@@ -29,7 +29,7 @@ env:
                 WebDriver:
                     browser: chrome
                     capabilities:
-                        browserName: chrome
+                        acceptInsecureCerts: true
 
     firefox:
         modules:
@@ -39,8 +39,9 @@ env:
                 WebDriver:
                     browser: firefox
                     capabilities:
-                        browserName: firefox
-
+                        acceptInsecureCerts: true
+                        moz:firefoxOptions:
+                            args: ["-headless"]
 
 extensions:
     enabled: