From 1ae709f0ee22e0603cbe3d9bed03ffce64ee4827 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Wed, 30 Aug 2023 20:13:53 +0100 Subject: [PATCH 01/10] Upgrade Selenium images --- .../scaffold/nightwatch/docker-compose.selenium.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml b/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml index 9fa56d5f4..f61b8076c 100644 --- a/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml +++ b/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml @@ -3,7 +3,7 @@ version: '3.6' services: chrome: container_name: ddev-${DDEV_SITENAME}-chrome - image: seleniarm/standalone-chromium:4.1.2-20220227 + image: seleniarm/standalone-chromium:4.10 labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.approot: $DDEV_APPROOT @@ -29,7 +29,7 @@ services: firefox: container_name: ddev-${DDEV_SITENAME}-firefox - image: seleniarm/standalone-firefox:4.1.2-20220227 + image: seleniarm/standalone-firefox:4.10 labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.approot: $DDEV_APPROOT From 93570d30c6ede0399384995b1a48336b3ad95097 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Wed, 30 Aug 2023 20:15:44 +0100 Subject: [PATCH 02/10] Replace instaclick/php-webdriver with lullabot/php-webdriver --- .github/workflows/TestPHPUnit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index 28169a7fe..d8e54b9ea 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -48,6 +48,7 @@ jobs: ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}' ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}' ddev composer config minimum-stability dev + ddev composer require lullabot/php-webdriver:dev-main --dev ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies # Restart is required to enable the provided Selenium containers From 68eb9813144709e9ffd0824b7b1395f18a531062 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 09:36:23 +0100 Subject: [PATCH 03/10] Remove /wd/hub from URL --- scaffold/phpunit-testtraits.xml | 4 ++-- scaffold/phpunit.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scaffold/phpunit-testtraits.xml b/scaffold/phpunit-testtraits.xml index 85efdfd8a..a6cfb39d1 100644 --- a/scaffold/phpunit-testtraits.xml +++ b/scaffold/phpunit-testtraits.xml @@ -26,10 +26,10 @@ --> - + - + diff --git a/scaffold/phpunit.xml b/scaffold/phpunit.xml index 5f3f9d1d2..9c42f6f93 100644 --- a/scaffold/phpunit.xml +++ b/scaffold/phpunit.xml @@ -26,7 +26,7 @@ --> - + From 3d534086babe9f3ea91277c9052be1c533734db5 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 09:50:04 +0100 Subject: [PATCH 04/10] Fix --no-sandbox flag --- scaffold/phpunit-testtraits.xml | 4 ++-- scaffold/phpunit.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scaffold/phpunit-testtraits.xml b/scaffold/phpunit-testtraits.xml index a6cfb39d1..eb7d8f87b 100644 --- a/scaffold/phpunit-testtraits.xml +++ b/scaffold/phpunit-testtraits.xml @@ -26,10 +26,10 @@ --> - + - + diff --git a/scaffold/phpunit.xml b/scaffold/phpunit.xml index 9c42f6f93..cd77eda03 100644 --- a/scaffold/phpunit.xml +++ b/scaffold/phpunit.xml @@ -25,8 +25,8 @@ external DDev URL so you can follow the links directly. --> - - + + From d85f8dceeadd8598e7f0e66a33b485a72625418d Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 10:06:05 +0100 Subject: [PATCH 05/10] Debugging --- .github/workflows/TestPHPUnit.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index d8e54b9ea..d92ac9267 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -133,9 +133,12 @@ jobs: run: | ddev drush site:install -y ddev drush user:password admin password - ddev task test:phpunit:functional format=junit - docker logs -s chrome | tee test_result/ddev-chrome.log - docker logs -s firefox | tee test_result/ddev-firefox.log + #ddev task test:phpunit:functional format=junit + #docker logs -s chrome | tee test_result/ddev-chrome.log + #docker logs -s firefox | tee test_result/ddev-firefox.log + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Upload test artifacts if: ${{ always() }} From cdd1f23540dfa284bdd9395a04357b95df6f5742 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 10:19:35 +0100 Subject: [PATCH 06/10] Remove debugging and add override library --- .github/workflows/TestPHPUnit.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index d92ac9267..95c312e68 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -115,6 +115,7 @@ jobs: ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true ddev composer config --no-plugins allow-plugins.weitzman/drupal-test-traits true + ddev composer require lullabot/php-webdriver:dev-main --dev ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}' ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}' ddev composer config minimum-stability dev @@ -133,12 +134,9 @@ jobs: run: | ddev drush site:install -y ddev drush user:password admin password - #ddev task test:phpunit:functional format=junit - #docker logs -s chrome | tee test_result/ddev-chrome.log - #docker logs -s firefox | tee test_result/ddev-firefox.log - - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + ddev task test:phpunit:functional format=junit + docker logs -s chrome | tee test_result/ddev-chrome.log + docker logs -s firefox | tee test_result/ddev-firefox.log - name: Upload test artifacts if: ${{ always() }} From 4046fd1b27389e1b6361ca050543c2dc4f63c66a Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 10:20:00 +0100 Subject: [PATCH 07/10] Remove debugging and add override library --- .github/workflows/TestPHPUnit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index 95c312e68..8947de4d3 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -115,10 +115,10 @@ jobs: ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true ddev composer config --no-plugins allow-plugins.lullabot/drainpipe-dev true ddev composer config --no-plugins allow-plugins.weitzman/drupal-test-traits true - ddev composer require lullabot/php-webdriver:dev-main --dev ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}' ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}' ddev composer config minimum-stability dev + ddev composer require lullabot/php-webdriver:dev-main --dev ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits behat/mink-selenium2-driver --dev --with-all-dependencies # Restart is required to enable the provided Selenium containers From 5520af0b4279c4b20253d30e7e11953c3f43aa8f Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 10:28:32 +0100 Subject: [PATCH 08/10] Debugging --- .github/workflows/TestPHPUnit.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index 8947de4d3..7b5ccc7fb 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -134,9 +134,12 @@ jobs: run: | ddev drush site:install -y ddev drush user:password admin password - ddev task test:phpunit:functional format=junit - docker logs -s chrome | tee test_result/ddev-chrome.log - docker logs -s firefox | tee test_result/ddev-firefox.log + #ddev task test:phpunit:functional format=junit + #docker logs -s chrome | tee test_result/ddev-chrome.log + #docker logs -s firefox | tee test_result/ddev-firefox.log + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Upload test artifacts if: ${{ always() }} From f4f0df110b2399a64a709e85c9a0c1917f839472 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Thu, 31 Aug 2023 11:27:16 +0100 Subject: [PATCH 09/10] test branch --- .github/workflows/TestPHPUnit.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index 7b5ccc7fb..325fae1a2 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -118,7 +118,7 @@ jobs: ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}' ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}' ddev composer config minimum-stability dev - ddev composer require lullabot/php-webdriver:dev-main --dev + ddev composer require lullabot/php-webdriver:dev-justafish/unset-name --dev ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits behat/mink-selenium2-driver --dev --with-all-dependencies # Restart is required to enable the provided Selenium containers @@ -134,12 +134,9 @@ jobs: run: | ddev drush site:install -y ddev drush user:password admin password - #ddev task test:phpunit:functional format=junit - #docker logs -s chrome | tee test_result/ddev-chrome.log - #docker logs -s firefox | tee test_result/ddev-firefox.log - - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + ddev task test:phpunit:functional format=junit + docker logs -s chrome | tee test_result/ddev-chrome.log + docker logs -s firefox | tee test_result/ddev-firefox.log - name: Upload test artifacts if: ${{ always() }} From bd82971a1c7715ae1ac2a218d18a3ba493191931 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Tue, 12 Sep 2023 16:37:41 +0100 Subject: [PATCH 10/10] Downgrade Selenium --- .../scaffold/nightwatch/docker-compose.selenium.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml b/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml index f61b8076c..9fa56d5f4 100644 --- a/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml +++ b/drainpipe-dev/scaffold/nightwatch/docker-compose.selenium.yaml @@ -3,7 +3,7 @@ version: '3.6' services: chrome: container_name: ddev-${DDEV_SITENAME}-chrome - image: seleniarm/standalone-chromium:4.10 + image: seleniarm/standalone-chromium:4.1.2-20220227 labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.approot: $DDEV_APPROOT @@ -29,7 +29,7 @@ services: firefox: container_name: ddev-${DDEV_SITENAME}-firefox - image: seleniarm/standalone-firefox:4.10 + image: seleniarm/standalone-firefox:4.1.2-20220227 labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.approot: $DDEV_APPROOT