Add screen resolution aliases as capabilities for Zalenium

Author: elgalu

.travis.yml

@@ -31,16 +31,6 @@ matrix:
           DOCKER_COMPOSE_VERSION="1.11.2"
           DOCKER_PUSH=true
           DOCKER_PUSH_LATEST=true
-    # Linux with docker:stable compose:beta/older
-    - os: linux
-      language: generic
-      sudo: required
-      dist: trusty
-      services:
-        - docker
-      env:
-        - DOCKER_VERSION="stable"
-          DOCKER_COMPOSE_VERSION="1.11.1"
 
 before_install:
   - travis_retry ./test/before_install_setup

CHANGELOG.md

@@ -7,8 +7,44 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (TBD_DATE)
+    + Add screen resolution aliases as capabilities for Zalenium
+        screenResolution
+        resolution
+        screen-resolution
+
+      e.g.
+        12:50:55.546 INFO - Adding browserName=chrome,maxInstances=1,platform=LINUX,acceptSslCerts=true,screenResolution=1900x1880,resolution=1900x1880,screen-resolution=1900x1880,version=57.0.2987.110 ,chrome_binary=/usr/bin/google-chrome-stable
+
+        12:50:55.543 INFO - Adding browserName=firefox,maxInstances=1,platform=LINUX,acceptSslCerts=true,screenResolution=1900x1880,resolution=1900x1880,screen-resolution=1900x1880,version=47.0.1,firefox_binary=/home/seluser/firefox-for-sel-2/firefox
+
+    + Remove docker:stable compose:beta/older TravisCI test as is not providing any value
+    + Bump Supervisor up to 2017-03-07 commit: 23925d017f8ecc
+ + **Image tag details:**
+    + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+    + Selenium 3: 3.2.0 (8c03df6)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+    + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+    + Geckodriver: TBD_GECKO_DRIVER
+    + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+    + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+    + Timezone: TBD_TIME_ZONE
+    + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+    + Python: TBD_PYTHON_VERSION
+    + Tested on kernel dev host: 4.4.0-66-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.03.0-ce, build 60ccb22
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+    + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+    + Image size: TBD_IMAGE_SIZE
+    + Digest: TBD_DIGEST
+    + Image ID: TBD_IMAGE_ID
+
 ## 3.2.0-p1
- + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (2017-03-20)
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/b87af04d2d7f767c65d666d...6bf62d977c15c77084e3b2b (2017-03-20)
     + Upgrade Chrome patch to 57.0.2987.110
     + Add Dockerfile `LABEL selenium_version`
  + **Image tag details:**

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Upgrade Chrome patch to 57.0.2987.110"
+    git commit -m "Add screen resolution aliases as capabilities for Zalenium"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -307,11 +307,11 @@ RUN apt-get -qqy update \
 # RUN apt-get -qqy update \
 #   && apt-get -qqy install \
 #     supervisor \
+# 2017-03-07 commit: 23925d017f8ecc, supervisor/version.txt: 4.0.0.dev0
 # 2017-01-05 commit: 8be5bc15e83f0f, supervisor/version.txt: 4.0.0.dev0
 # 2016-11-05 commit: cbebb93f58f4a9, supervisor/version.txt: 4.0.0.dev0
-# 2016-10-09 commit: 427eb2bc6b08f7, supervisor/version.txt: 4.0.0.dev0
 ENV RUN_DIR="/var/run/sele"
-RUN SHA="8be5bc15e83f0f261fa50ef28de814dd14f7c25e" \
+RUN SHA="23925d017f8eccafb1be57c509a07df75490c83d" \
   && pip install --upgrade \
       "https://github.com/Supervisor/supervisor/zipball/${SHA}" \
   && rm -rf /var/lib/apt/lists/*

VERSION

@@ -1 +1 @@
-3.2.0-p1
+3.2.0-p2

bin/entry.sh

@@ -74,15 +74,30 @@ export DOCKER_SELENIUM_STATUS="${LOGS_DIR}/docker-selenium-status.log"
 export VNC_TRYOUT_ERR_LOG="${LOGS_DIR}/vnc-tryouts-stderr"
 export VNC_TRYOUT_OUT_LOG="${LOGS_DIR}/vnc-tryouts-stdout"
 touch ${DOCKER_SELENIUM_STATUS}
+
 # We recalculate screen dimensions because docker run supports changing them
 export SCREEN_DEPTH="${SCREEN_MAIN_DEPTH}+${SCREEN_SUB_DEPTH}"
 export GEOMETRY="${SCREEN_WIDTH}""x""${SCREEN_HEIGHT}""x""${SCREEN_DEPTH}"
+
 # These values are only available when the container started
 export DOCKER_HOST_IP=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
 export CONTAINER_IP=$(ip addr show dev ${ETHERNET_DEVICE_NAME} | grep "inet " | awk '{print $2}' | cut -d '/' -f 1)
-export COMMON_CAPS="maxInstances=${MAX_INSTANCES},platform=LINUX,acceptSslCerts=true"
+
+# Common capabilities for both nodes (Chrome/Firefox)
+export COMMON_CAPS="maxInstances=${MAX_INSTANCES}"
+export COMMON_CAPS="${COMMON_CAPS},platform=LINUX"
+export COMMON_CAPS="${COMMON_CAPS},acceptSslCerts=true"
+# https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options#TestConfigurationOptions-SpecifyingtheScreenResolution
+export COMMON_CAPS="${COMMON_CAPS},screenResolution=${SCREEN_WIDTH}x${SCREEN_HEIGHT}"
+# https://www.browserstack.com/automate/capabilities
+export COMMON_CAPS="${COMMON_CAPS},resolution=${SCREEN_WIDTH}x${SCREEN_HEIGHT}"
+# https://testingbot.com/support/other/test-options#screenresolution
+export COMMON_CAPS="${COMMON_CAPS},screen-resolution=${SCREEN_WIDTH}x${SCREEN_HEIGHT}"
+
+# CHROME_FLAVOR would allow to have separate installations for stable, beta, unstable
 export CHROME_PATH="/usr/bin/google-chrome-${CHROME_FLAVOR}"
 export CHROME_VERSION=$(${CHROME_PATH} --version 2>&1 | grep "Google Chrome" | grep -iEo "[0-9.]{2,20}.*")
+
 # Video
 export FFMPEG_FRAME_SIZE="${SCREEN_WIDTH}x${SCREEN_HEIGHT}"
 

selenium-node-chrome/bin/start-selenium-node-chrome.sh

@@ -34,7 +34,10 @@ echo "INFO: JAVA_OPTS are '${JAVA_OPTS}'"
 #  https://github.com/pilwon/selenium-webdriver/blob/master/java/server/src/org/openqa/grid/common/defaults/GridParameters.properties
 # See node defaults at
 #  https://github.com/pilwon/selenium-webdriver/blob/master/java/server/src/org/openqa/grid/common/defaults/DefaultNode.json
-CHROME_BROWSER_CAPS="browserName=chrome,${COMMON_CAPS},version=${CHROME_VERSION},chrome_binary=${CHROME_PATH}"
+CHROME_BROWSER_CAPS="browserName=chrome,${COMMON_CAPS}"
+CHROME_BROWSER_CAPS="${CHROME_BROWSER_CAPS},version=${CHROME_VERSION}"
+CHROME_BROWSER_CAPS="${CHROME_BROWSER_CAPS},chrome_binary=${CHROME_PATH}"
+
 java \
   -Dwebdriver.chrome.driver="/home/seluser/chromedriver" \
   -Dwebdriver.chrome.logfile="${LOGS_DIR}/chromedriver.log" \

selenium-node-firefox/bin/start-selenium-node-firefox.sh

@@ -39,7 +39,10 @@ echo "INFO: JAVA_OPTS are '${JAVA_OPTS}'"
 # See node defaults at
 #  https://github.com/pilwon/selenium-webdriver/blob/master/java/server/src/org/openqa/grid/common/defaults/DefaultNode.json
 # TODO: how to set default firefox to latest?
-export FIREFOX_BROWSER_CAPS="browserName=firefox,${COMMON_CAPS},version=${FIREFOX_VERSION},firefox_binary=${FIREFOX_DEST_BIN}"
+FIREFOX_BROWSER_CAPS="browserName=firefox,${COMMON_CAPS}"
+FIREFOX_BROWSER_CAPS="${FIREFOX_BROWSER_CAPS},version=${FIREFOX_VERSION}"
+FIREFOX_BROWSER_CAPS="${FIREFOX_BROWSER_CAPS},firefox_binary=${FIREFOX_DEST_BIN}"
+
 java \
   ${JAVA_OPTS} \
   -jar ${SELENIUM_JAR_PATH} \