Merge remote-tracking branch 'magenius-team/selenium-standalone' into…

… develop
wardenenv · May 4, 2021 · 416f437 · 416f437
2 parents 9525563 + 0fa1083
commit 416f437
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/commands/vnc.cmd b/commands/vnc.cmd
@@ -9,7 +9,7 @@ if [[ ${WARDEN_SELENIUM} -ne 1 ]] || [[ ${WARDEN_SELENIUM_DEBUG} -ne 1 ]]; then
 fi
 
 WARDEN_SELENIUM_INDEX=${WARDEN_PARAMS[0]:-1}
-WARDEN_SELENIUM_VNC=${WARDEN_ENV_NAME}_${WARDEN_PARAMS[1]:-selenium-chrome}_${WARDEN_SELENIUM_INDEX}
+WARDEN_SELENIUM_VNC=${WARDEN_ENV_NAME}_${WARDEN_PARAMS[1]:-selenium}_${WARDEN_SELENIUM_INDEX}
 
 if ! which remmina >/dev/null; then
   EXPOSE_PORT=$((5900 + WARDEN_SELENIUM_INDEX))

diff --git a/docs/configuration/magento2-testing.md b/docs/configuration/magento2-testing.md
@@ -298,7 +298,7 @@ To run Acceptance tests you need to [configure the MFTF environment](mftf.md). O
     - `MAGENTO_BASE_URL`
     - `MAGENTO_BACKEND_NAME` to your Backend path (Check with `bin/magento info:adminuri`)
     - `MAGENTO_ADMIN_USERNAME` and `MAGENTO_ADMIN_PASSWORD`
-    - `SELENIUM_HOST` (by default it is `selenium-hub`)
+    - `SELENIUM_HOST` (by default it is `selenium`)
 
    Sample configuration
    ```
@@ -309,7 +309,7 @@ To run Acceptance tests you need to [configure the MFTF environment](mftf.md). O
    BROWSER=chrome
    MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProductCatalogSearch
    ELASTICSEARCH_VERSION=7
-   SELENIUM_HOST=selenium-hub
+   SELENIUM_HOST=selenium
    ```
    More details can be found [in Magento DevDocs](https://devdocs.magento.com/mftf/docs/configuration.html).
 

diff --git a/docs/configuration/mftf.md b/docs/configuration/mftf.md
@@ -11,7 +11,7 @@ WARDEN_SELENIUM=1
 After generating MFTF configuration files (`dev/tests/acceptance/.env` generated by `vendor/bin/mftf setup:env` command), you need to provide selenium hostname:
 
 ```
-SELENIUM_HOST=selenium-hub
+SELENIUM_HOST=selenium
 BROWSER=chrome
 ```
 
@@ -43,7 +43,7 @@ To preview the process of testing, you need any **VLC** client that provides **S
 
 To preview the process in Mac OS X, you must first create an SSH tunnel to the docker instance hosting the VNC server.  That would look something like:
 
-    ssh -N -L localhost:5901:magento2_selenium-chrome_1:5900 tunnel.warden.test
+    ssh -N -L localhost:5901:magento2_selenium_1:5900 tunnel.warden.test
 
 Where `5901` is the port on your local computer you want to use to access the VNC server.  Then, using Finder you can "Go > Connect to Server" `vnc://localhost:5901`.
 

diff --git a/environments/includes/selenium.base.yml b/environments/includes/selenium.base.yml
@@ -1,27 +1,8 @@
 version: "3.5"
 services:
-  selenium-hub:
-    container_name: ${WARDEN_ENV_NAME}_selenium-hub
-    hostname: selenium-hub
-    image: selenium/hub:latest
-    healthcheck:
-      test: /opt/bin/check-grid.sh --host 0.0.0.0 --port 4444
-      interval: 20s
-      retries: 3
-    environment:
-      GRID_TIMEOUT: 0
-      GRID_BROWSER_TIMEOUT: 0
-
-  selenium-chrome:
-    hostname: ${WARDEN_ENV_NAME}_selenium-chrome
-    image: selenium/node-chrome${WARDEN_SELENIUM_DEBUG:-}:3.8.1
+  selenium:
+    hostname: ${WARDEN_ENV_NAME}_selenium
+    image: selenium/standalone-chrome${WARDEN_SELENIUM_DEBUG:-}:${WARDEN_SELENIUM_VERSION:-3.141.59}
     extra_hosts:
       - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
       - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
-    depends_on:
-      - selenium-hub
-    environment:
-      - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
-      - START_XVFB=false
-