Breaking change! New default: USE_SELENIUM=3

Author: elgalu

.travis.yml

@@ -45,7 +45,6 @@ script:
   - travis_retry ./test/script_scenario_restart
   - travis_retry ./test/script_scenario_node_dies
   - travis_retry ./test/script_scenario_make
-  - travis_retry ./test/script_scenario_compose_1_1
   - travis_retry ./test/script_scenario_compose_N_N
 
 # cleanup though doesn't seem to be necessary in Travis infra

CHANGELOG.md

@@ -11,6 +11,8 @@ Note image ids also change after scm-source.json has being updated which trigger
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/4af973351e7d418b67e3...master (TBD_DATE)
     + Upgrade Chrome major from 57 to 58.0.3029.81
     + Add node capability: tz=Europe/Berlin / custom value
+    + Breaking change! New default: USE_SELENIUM="3"
+        + Deprecate Selenium IDE RC tests
  + **Image tag details:**
     + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
     + Selenium 3: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)

CONTRIBUTING.md

@@ -5,14 +5,14 @@ For pull requests or local commits:
 
     time (./test/bef && ./test/install && ./test/script_start && ./test/script_end)
     docker exec grid versions && ./test/after_script && travis lint
-    open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mp4
-    git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
+    open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mp4
+    git checkout ./images/grid3_console.png scm-source.json
     git checkout -b tmp-`cat VERSION`
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Upgrade Chrome major from 57 to 58.0.3029.81"
+    git commit -m "Breaking change! New default: USE_SELENIUM=3"
     git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -793,7 +793,7 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
 # GA_API_VERSION
 #   All Google Analytics related, see LICENSE.md & Analytics.md for more info
 ENV FIREFOX_VERSION="${FF_VER}" \
-  USE_SELENIUM="2" \
+  USE_SELENIUM="3" \
   CHROME_FLAVOR="stable" \
   PICK_ALL_RANDOM_PORTS="false" \
   RANDOM_PORT_FROM="23100" \

capabilities.json

@@ -7,7 +7,7 @@
     },
     {
       "BROWSER_NAME": "firefox",
-      "VERSION": "47.0.1",
+      "VERSION": "52.0.2",
       "PLATFORM": "LINUX"
     }
   ]

test/after_script

@@ -4,7 +4,5 @@
 docker exec grid stop || true
 docker stop grid || true
 docker rm grid || true
-docker rm -vf grid2 || true
-docker rm -vf grid3 || true
 # quick destroy
 docker rm -vf grid_mock || true

test/script_archive

@@ -7,7 +7,7 @@ echo "#=================="
 echo "# Archive artifacts"
 echo "#=================="
 # pending to upload to S3 bucket
-docker cp grid:/test/console.png ./images/grid2_console.png
+docker cp grid:/test/console.png ./images/grid3_console.png
 ls -la ./images/
 mkdir -p ./videos
 docker cp grid:/test/videos/chrome ./videos/

test/script_push

@@ -195,7 +195,6 @@ git_diff_add_commit() {
   git status
   git add CHANGELOG.md
   git add capabilities.json
-  git add images/grid2_console.png
   git add images/grid3_console.png
   git commit -m "${TRAVIS_TAG}: Update image id, digest & png [ci skip]"
   git --no-pager log -n3
@@ -236,9 +235,6 @@ git_push_tag_push() {
 ########
 # Main #
 ########
-# docker cp grid:/capabilities.json .
-# docker cp grid:/capabilities2.json .
-# docker cp grid3:/capabilities3.json .
 if [ "${TRAVIS_PULL_REQUEST}" == "true" ]; then
   echo "This is a pull request so no docker push."
 elif [ "${DOCKER_PUSH}" != "true" ]; then

test/script_scenario_basic

@@ -15,9 +15,6 @@ docker tag selenium:latest elgalu/selenium:latest
 
 # Ensure clean env
 docker rm -vf grid || true
-docker rm -vf grid2 || true
-docker rm -vf grid3 || true
-docker rm -vf gridrc || true
 # Some dummy log files
 rm -rf **/*"conflicted copy"*.log
 
@@ -82,79 +79,6 @@ if ! docker exec -t grid run_test; then
 fi
 
 docker exec grid errors || true
-
-echo "#==================================================================="
-echo "# Scenario 1c [basic]: Test Selenium 3"
-echo "#==================================================================="
-
-docker run --name=grid3 -d -e VIDEO=true \
-  -e MOCK_SERVER_HOST="d.host.loc.dev" \
-  -e MOCK_SERVER_PORT \
-  -e USE_SELENIUM="3" \
-  -e CI \
-  -e VIDEO_CONVERSION_MAX_WAIT="40s" \
-  --shm-size=1g \
-  selenium
-
-sleep ${ADDED_TEST_SLEEP} && docker logs grid3
-docker exec grid3 wait_all_done 70s
-docker exec grid3 versions
-docker exec grid3 errors || true
-docker logs grid3
-docker exec -t grid3 run_test
-docker exec grid3 errors || true
-docker cp grid3:/test/console.png ./images/grid3_console.png
-
-# Separate capabilities2.json from capabilities3.json
+docker cp grid:/test/console.png ./images/grid3_console.png
 docker cp grid:/capabilities.json .
-docker cp grid:/capabilities2.json .
-docker cp grid3:/capabilities3.json .
-
-# cleanup (not yet because we need to extract the capabilities)
-# docker stop grid3 || true
-# docker rm grid3 || true
-
-echo "#==================================================================="
-echo "# Scenario 1d [basic]: Selenium IDE RC and mount videos"
-echo "#==================================================================="
-
-rm -rf ./videos/mounted
-mkdir -p ./videos/mounted
-docker run --name=gridrc -d -e VIDEO=true \
-  -e MOCK_SERVER_HOST="d.host.loc.dev" \
-  -e MOCK_SERVER_PORT \
-  -e CI \
-  -e VIDEO_CONVERSION_MAX_WAIT="40s" \
-  -e USE_SELENIUM="2" \
-  -e CHROME=true -e FIREFOX=true \
-  -e RC_CHROME=true -e RC_FIREFOX=true \
-  -e VIDEO_FILE_NAME=sele_ide \
-  -e HOST_GID=$(id -g) -e HOST_UID=$(id -u) \
-  --shm-size=1g \
-  -p 4444:24444 \
-  -v ${PWD}/videos/mounted:/home/seluser/videos \
-  selenium
-
-sleep ${ADDED_TEST_SLEEP} && docker logs gridrc
-docker exec gridrc wait_all_done 70s
-docker exec gridrc versions
-docker exec gridrc errors || true
-docker logs gridrc
-
-# Run tests
-cd test/seleIDE
-gem install bundler -v=1.13.2
-bundle install
-RUBYOPT=W0 bundle exec ./seleIDE *.rb
-
-docker exec gridrc stop-video
-docker exec gridrc errors || true
-cd ../..
-mkdir -p ./videos/rc
-docker cp gridrc:/videos/sele_ide.mp4 ./videos/rc/
-ls -la ./videos/rc/sele_ide.mp4
-ls -la ./videos/mounted/sele_ide.mp4
-
-# cleanup
-docker stop gridrc || true
-docker rm gridrc || true
+docker cp grid:/capabilities3.json .