From 47cb74179e73643ddcf74b4b961459ef73b5587d Mon Sep 17 00:00:00 2001
From: Yves Lavoie <ylavoie@yveslavoie.com>
Date: Wed, 10 Jun 2020 15:38:03 -0400
Subject: [PATCH] Move back to standard selenium port 4444

---
 .circleci/config.yml | 61 +++++++++++++++-----------------------------
 .travis.yml          |  2 +-
 t/.pherkin.yaml      |  2 +-
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12302bfe322..48273119a67 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,6 +14,15 @@ aliases:
     store_artifacts:
       path: /tmp/artifact/
 
+job_filters: &job_filters
+  branches:
+    ignore:
+      - /1\.2\..*/
+      - /1\.3\..*/
+      - /1\.4\..*/
+      - /1\.5\..*/
+      - /1\.6\..*/
+
 # Reuseable commands
 commands:
   prove:
@@ -164,7 +173,7 @@ executors:
 
 # Define jobs
 jobs:
-  test_nodojo_chrome:
+  test_webpack_chrome:
     <<: *defaults
     executor:
       name: test
@@ -176,7 +185,7 @@ jobs:
       - start_plackup
       - start_proxy
       - prove
-  test_nodojo_firefox:
+  test_webpack_firefox:
     <<: *defaults
     executor:
       name: test
@@ -188,7 +197,7 @@ jobs:
       - start_plackup
       - start_proxy
       - prove
-  test_nodojo_opera:
+  test_webpack_opera:
     <<: *defaults
     executor:
       name: test
@@ -200,7 +209,7 @@ jobs:
       - start_plackup
       - start_proxy
       - prove
-  test_nodojo_phantomjs:
+  test_webpack_phantomjs:
     <<: *defaults
     executor:
       name: test
@@ -221,47 +230,19 @@ orbs:
 workflows:
   workflow:
     jobs:
-      - test_nodojo_chrome:
-          filters:
-             branches:
-                ignore:
-                  - /1\.2\..*/
-                  - /1\.3\..*/
-                  - /1\.4\..*/
-                  - /1\.5\..*/
-                  - /1\.6\..*/
+      - test_webpack_chrome:
+          filters: *job_filters
           pre-steps:
             - diagnostic-orb/env-info
             - diagnostic-orb/memory
           post-steps:
             - diagnostic-orb/store-report
 
-      - test_nodojo_firefox:
-          filters:
-             branches:
-                ignore:
-                  - /1\.2\..*/
-                  - /1\.3\..*/
-                  - /1\.4\..*/
-                  - /1\.5\..*/
-                  - /1\.6\..*/
+      - test_webpack_firefox:
+          filters: *job_filters
 
-      - test_nodojo_opera:
-          filters:
-             branches:
-                ignore:
-                  - /1\.2\..*/
-                  - /1\.3\..*/
-                  - /1\.4\..*/
-                  - /1\.5\..*/
-                  - /1\.6\..*/
+      - test_webpack_opera:
+          filters: *job_filters
 
-      - test_nodojo_phantomjs:
-          filters:
-             branches:
-                ignore:
-                  - /1\.2\..*/
-                  - /1\.3\..*/
-                  - /1\.4\..*/
-                  - /1\.5\..*/
-                  - /1\.6\..*/
+      - test_webpack_phantomjs:
+          filters: *job_filters
diff --git a/.travis.yml b/.travis.yml
index 68561e07480..fb12d451718 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -148,7 +148,7 @@ before_script:
   - cp t/.proverc ./
   - coverage-setup
   - sed -e "s#{ROOT}#$PWD#" doc/conf/nginx-travis.conf >/tmp/nginx.conf
-  - ((phantomjs --webdriver=4422 2>/dev/null >/dev/null &) && echo "PhantomJS started succesfully") || (echo "Failed to start PhantomJS!" ; exit 1)
+  - ((phantomjs --webdriver=4444 2>/dev/null >/dev/null &) && echo "PhantomJS started succesfully") || (echo "Failed to start PhantomJS!" ; exit 1)
   - PERL5OPT="$PERL5OPT $HARNESS_PERL_SWITCHES" starman --preload-app --pid starman.pid --workers $(test-jobs) -Ilib -Iold/lib --port 5762 bin/ledgersmb-server.psgi --access-log /tmp/plackup-access.log 2> /tmp/plackup-error.log &
   - nginx -c /tmp/nginx.conf
   # display the available resources
diff --git a/t/.pherkin.yaml b/t/.pherkin.yaml
index faef59a8766..7b813494cb6 100644
--- a/t/.pherkin.yaml
+++ b/t/.pherkin.yaml
@@ -28,7 +28,7 @@ default:
                 wait_timeout: 3000
                 window_size:  1024x1280
                 caps:
-                  port: 4422
+                  port: 4444
                   remote_server_addr: ${REMOTE_SERVER_ADDR}
                   browser_name: ${BROWSER}
       Pherkin::Extension::PageObject: