From 2fdfb02bacf3ec813020140dd4283fdda9766b20 Mon Sep 17 00:00:00 2001
From: nagyad <joevagyok@gmail.com>
Date: Mon, 5 Sep 2022 14:09:30 +0200
Subject: [PATCH 1/2] EWPP-2594: Use selenium 4.

---
 .drone.yml         |  8 +++-----
 behat.yml.dist     | 28 +++++++++++++++++++++++++++-
 docker-compose.yml |  2 +-
 phpunit.xml.dist   |  2 +-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e30a710be..9a4310db8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,13 +31,11 @@ services:
       - SPARQL_UPDATE=true
       - DBA_PASSWORD=dba
   selenium:
-    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-3.141.59-oxygen
+    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-4.1.3-20220405
     environment:
       - DISPLAY=:99
-      - SE_OPTS=-debug
-      - DISPLAY=:99
-      - SCREEN_WIDTH=1280
-      - SCREEN_HEIGHT=800
+      - SCREEN_WIDTH=1600
+      - SCREEN_HEIGHT=1200
       - NODE_MAX_INSTANCES=5
       - NODE_MAX_SESSION=5
 
diff --git a/behat.yml.dist b/behat.yml.dist
index bff20ae34..001a0b742 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -55,7 +55,33 @@ default:
       javascript_session: 'selenium2'
       selenium2:
         wd_host: '${selenium.host}:${selenium.port}/wd/hub'
-        capabilities: { "browser": "chrome", "version": "*" }
+        capabilities:
+          browser: chrome
+          nativeEvents: true
+          marionette: true
+          browserName: chrome
+          version: '*'
+          extra_capabilities:
+            loggingPrefs:
+              performance: ALL
+              browser: ALL
+            chromeOptions:
+              w3c: false
+              args:
+                - '--no-sandbox'
+                - '--start-maximized'
+                - '--disable-gpu'
+                - '--window-size=1600,1200'
+                - '--disable-dev-shm-usage'
+                - '--disable-setuid-sandbox'
+                - '--disable-web-security'
+                - '--DNS-prefetch-disable'
+                - '--disable-translate'
+                - '--ignore-certificate-errors'
+                - '--test-type'
+                - '--disable-extensions'
+                - '--incognito'
+                - '--disable-infobars'
       base_url: "${drupal.base_url}"
       files_path: "%paths.base%/tests/fixtures/"
     Drupal\DrupalExtension:
diff --git a/docker-compose.yml b/docker-compose.yml
index a9fbfda11..b2db21c03 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
   #      - 3306:3306
   # Spawn a Selenium server which also includes a VNC server on localhost:5900 (the password is "secret")
   selenium:
-    image: selenium/standalone-chrome-debug:3.11
+    image: selenium/standalone-chrome-4.1.3-20220405
     environment:
       - DISPLAY=:99
       - SCREEN_WIDTH=1440
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ea773f57f..77f5faceb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,7 +7,7 @@
     <env name="SIMPLETEST_BASE_URL" value="${drupal.base_url}"/>
     <env name="SIMPLETEST_DB" value="mysql://${drupal.database.user}:${drupal.database.password}@${drupal.database.host}:${drupal.database.port}/${drupal.database.name}"/>
     <env name="SIMPLETEST_SPARQL_DB" value="sparql://${drupal.sparql.host}:${drupal.sparql.port}/?module=sparql_entity_storage"/>
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", null, "${selenium.host}:${selenium.port}/wd/hub"]'/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--no-sandbox", "--start-maximized", "--disable-gpu", "--window-size=1600,1200", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--disable-web-security", "--DNS-prefetch-disable", "--disable-translate", "--ignore-certificate-errors", "--test-type", "--disable-extensions", "--incognito", "--disable-infobars"]}}, "${selenium.host}:${selenium.port}/wd/hub"]'/>
   </php>
   <extensions>
     <extension class="Drupal\Tests\oe_theme\EnsurePHPUnitBatchingTestExtension" />

From 4350579a8df8f04cb8fec98d73725e2a513259bc Mon Sep 17 00:00:00 2001
From: 22Alexandra <beldean.ale@gmail.com>
Date: Tue, 6 Sep 2022 10:21:58 +0300
Subject: [PATCH 2/2] EWPP-2594: Use minimum required behat and phpunit
 configuration setup.

---
 behat.yml.dist     | 23 -----------------------
 docker-compose.yml |  2 +-
 phpunit.xml.dist   |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/behat.yml.dist b/behat.yml.dist
index 001a0b742..9b9f56f9d 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -56,32 +56,9 @@ default:
       selenium2:
         wd_host: '${selenium.host}:${selenium.port}/wd/hub'
         capabilities:
-          browser: chrome
           nativeEvents: true
           marionette: true
           browserName: chrome
-          version: '*'
-          extra_capabilities:
-            loggingPrefs:
-              performance: ALL
-              browser: ALL
-            chromeOptions:
-              w3c: false
-              args:
-                - '--no-sandbox'
-                - '--start-maximized'
-                - '--disable-gpu'
-                - '--window-size=1600,1200'
-                - '--disable-dev-shm-usage'
-                - '--disable-setuid-sandbox'
-                - '--disable-web-security'
-                - '--DNS-prefetch-disable'
-                - '--disable-translate'
-                - '--ignore-certificate-errors'
-                - '--test-type'
-                - '--disable-extensions'
-                - '--incognito'
-                - '--disable-infobars'
       base_url: "${drupal.base_url}"
       files_path: "%paths.base%/tests/fixtures/"
     Drupal\DrupalExtension:
diff --git a/docker-compose.yml b/docker-compose.yml
index b2db21c03..97d523e7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
   #      - 3306:3306
   # Spawn a Selenium server which also includes a VNC server on localhost:5900 (the password is "secret")
   selenium:
-    image: selenium/standalone-chrome-4.1.3-20220405
+    image: selenium/standalone-chrome:4.1.3
     environment:
       - DISPLAY=:99
       - SCREEN_WIDTH=1440
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 77f5faceb..580fdc812 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,7 +7,7 @@
     <env name="SIMPLETEST_BASE_URL" value="${drupal.base_url}"/>
     <env name="SIMPLETEST_DB" value="mysql://${drupal.database.user}:${drupal.database.password}@${drupal.database.host}:${drupal.database.port}/${drupal.database.name}"/>
     <env name="SIMPLETEST_SPARQL_DB" value="sparql://${drupal.sparql.host}:${drupal.sparql.port}/?module=sparql_entity_storage"/>
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--no-sandbox", "--start-maximized", "--disable-gpu", "--window-size=1600,1200", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--disable-web-security", "--DNS-prefetch-disable", "--disable-translate", "--ignore-certificate-errors", "--test-type", "--disable-extensions", "--incognito", "--disable-infobars"]}}, "${selenium.host}:${selenium.port}/wd/hub"]'/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", {"browserName":"chrome","chromeOptions":{"w3c": false}, "${selenium.host}:${selenium.port}/wd/hub"]'/>
   </php>
   <extensions>
     <extension class="Drupal\Tests\oe_theme\EnsurePHPUnitBatchingTestExtension" />