Merge pull request #65 from kayabendroth-epages/maint/new-selenium-version-2.46.0

rubytester · rubytester · commit 52233f089aee · 2015-06-08T17:56:50.000-05:00
Upgrade to Selenium version 2.46.0.
diff --git a/Base/Dockerfile b/Base/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update -qqy \
 # Selenium
 #==========
 RUN  mkdir -p /opt/selenium \
-  && wget --no-verbose http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar -O /opt/selenium/selenium-server-standalone.jar
+  && wget --no-verbose http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar -O /opt/selenium/selenium-server-standalone.jar
 
 #========================================
 # Add normal user with passwordless sudo
diff --git a/Hub/Dockerfile b/Hub/Dockerfile
@@ -1,4 +1,4 @@
-FROM selenium/base:2.45.0
+FROM selenium/base:2.46.0
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 #========================
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME := selenium
-VERSION := $(or $(VERSION),$(VERSION),'2.45.0')
+VERSION := $(or $(VERSION),$(VERSION),'2.46.0')
 PLATFORM := $(shell uname -s)
 
 all: hub chrome firefox chromedebug firefoxdebug standalone_chrome standalone_firefox standalone_debug_chrome standalone_debug_firefox
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
@@ -1,4 +1,4 @@
-FROM selenium/base:2.45.0
+FROM selenium/base:2.46.0
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile
@@ -1,4 +1,4 @@
-FROM selenium/node-base:2.45.0
+FROM selenium/node-base:2.46.0
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/node-chrome:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/node-chrome:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeChromeDebug/README.md b/NodeChromeDebug/README.md
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-chrome-debug:2.45.0
+FROM selenium/node-chrome-debug:2.46.0
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```
diff --git a/NodeDebug/Dockerfile b/NodeDebug/Dockerfile
@@ -1,4 +1,4 @@
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeDebug/README.template.md b/NodeDebug/README.template.md
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/##BASE##-debug:2.45.0
+FROM selenium/##BASE##-debug:2.46.0
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```
diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile
@@ -1,4 +1,4 @@
-FROM selenium/node-base:2.45.0
+FROM selenium/node-base:2.46.0
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/node-firefox:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/node-firefox:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeFirefoxDebug/README.md b/NodeFirefoxDebug/README.md
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-firefox-debug:2.45.0
+FROM selenium/node-firefox-debug:2.46.0
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```
diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ Images included:
 ### Standalone Chrome and Firefox
 
 ``` bash
-$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.45.0
+$ docker run -d -p 4444:4444 selenium/standalone-chrome:2.46.0
 # OR
-$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.45.0
+$ docker run -d -p 4444:4444 selenium/standalone-firefox:2.46.0
 ```
 
 Note: only one standalone image can run on port 4444 at a time.
@@ -38,14 +38,14 @@ To inspect visually what the browser is doing use the `standalone-chrome-debug`
 ### Selenium Grid Hub
 
 ``` bash
-$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.45.0
+$ docker run -d -p 4444:4444 --name selenium-hub selenium/hub:2.46.0
 ```
 
 ### Chrome and Firefox Nodes
 
 ``` bash
-$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.45.0
-$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.45.0
+$ docker run -d --link selenium-hub:hub selenium/node-chrome:2.46.0
+$ docker run -d --link selenium-hub:hub selenium/node-firefox:2.46.0
 ```
 
 ## Building the images
@@ -69,10 +69,10 @@ _Note: omitting `VERSION=local` will build the images with the current version n
 ##### e.g. Spawn a container for Chrome testing:
 
 ``` bash
-$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
+$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.46.0
 $ CH=$(docker run --rm --name=ch \
     --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-    selenium/node-chrome:2.45.0)
+    selenium/node-chrome:2.46.0)
 ```
 
 Note `-v /e2e/uploads:/e2e/uploads` is optional in case you are testing browser uploads on your webapp you'll probably need to share a directory for this.
@@ -84,27 +84,27 @@ I like to remove the containers after each e2e test with `--rm` since this docke
 This command line is the same as for Chrome, remember that the selenium running container is able to launch either Chrome or Firefox, the idea around having 2 separate containers, one for each browser is for convenience plus avoid certain `:focus` issues you web app may encounter during e2e automation.
 
 ``` bash
-$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.45.0
+$ docker run -d --name selenium-hub -p 4444:4444 selenium/hub:2.46.0
 $ FF=$(docker run --rm --name=fx \
     --link selenium-hub:hub -v /e2e/uploads:/e2e/uploads \
-    selenium/node-firefox:2.45.0)
+    selenium/node-firefox:2.46.0)
 ```
 
 ## Debugging
 
 In the event you wish to visually see what the browser is doing you will want to run the `debug` variant of node or standalone images.
 
 ``` bash
-$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.45.0
-$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.45.0
+$ docker run -d -P --link selenium-hub:hub selenium/node-chrome-debug:2.46.0
+$ docker run -d -P --link selenium-hub:hub selenium/node-firefox-debug:2.46.0
 ```
 
 And for standalone: 
 
 ``` bash
-$ docker run -d -p 4444:4444 selenium/standalone-chrome-debug:2.45.0
+$ docker run -d -p 4444:4444 selenium/standalone-chrome-debug:2.46.0
 # OR
-$ docker run -d -p 4444:4444 selenium/standalone-firefox-debug:2.45.0
+$ docker run -d -p 4444:4444 selenium/standalone-firefox-debug:2.46.0
 ```
 
 You can acquire the port that the VNC server is exposed to by running:
@@ -125,8 +125,8 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-#FROM selenium/node-chrome-debug:2.45.0
-#FROM selenium/node-firefox-debug:2.45.0
+#FROM selenium/node-chrome-debug:2.46.0
+#FROM selenium/node-firefox-debug:2.46.0
 # Choose the FROM statement that works for you.
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
diff --git a/Standalone/Dockerfile b/Standalone/Dockerfile
@@ -1,4 +1,4 @@
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 
 USER root
 
diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/node-chrome:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/node-chrome:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 
 USER root
 
diff --git a/StandaloneDebugChrome/Dockerfile b/StandaloneDebugChrome/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/standalone-chrome:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/standalone-chrome:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/StandaloneDebugFirefox/Dockerfile b/StandaloneDebugFirefox/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/standalone-firefox:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/standalone-firefox:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile
@@ -1,5 +1,5 @@
-FROM selenium/node-firefox:2.45.0
-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh
+FROM selenium/node-firefox:2.46.0
+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 
 USER root
 
diff --git a/sa-test.sh b/sa-test.sh
@@ -13,7 +13,7 @@ function test_standalone {
   BROWSER=$1
   echo Starting Selenium standalone-$BROWSER$DEBUG container
 
-  SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.45.0)
+  SA=$(docker run -d selenium/standalone-$BROWSER$DEBUG:2.46.0)
   SA_NAME=$(docker inspect -f '{{ .Name  }}' $SA | sed s:/::)
   TEST_CMD="node smoke-$BROWSER.js"
 
diff --git a/test.sh b/test.sh
@@ -9,12 +9,12 @@ echo Building test container image
 docker build -t selenium/test:local ./Test
 
 echo Starting Selenium Container
-HUB=$(docker run -d selenium/hub:2.45.0)
+HUB=$(docker run -d selenium/hub:2.46.0)
 HUB_NAME=$(docker inspect -f '{{ .Name  }}' $HUB | sed s:/::)
 sleep 2
 
-NODE_CHROME=$(docker run -d --link $HUB_NAME:hub  selenium/node-chrome$DEBUG:2.45.0)
-NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.45.0)
+NODE_CHROME=$(docker run -d --link $HUB_NAME:hub  selenium/node-chrome$DEBUG:2.46.0)
+NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.46.0)
 
 docker logs -f $HUB &
 docker logs -f $NODE_CHROME &

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM selenium/base:2.45.0`
	`1`	`+FROM selenium/base:2.46.0`
`2`	`2`	`MAINTAINER Selenium <[email protected]>`
`3`	`3`
`4`	`4`	`#========================`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM selenium/node-base:2.45.0`
	`1`	`+FROM selenium/node-base:2.46.0`
`2`	`2`	`MAINTAINER Selenium <[email protected]>`
`3`	`3`
`4`	`4`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#FROM selenium/node-*:2.45.0 Proper FROM attr will be applied throuh generate.sh`
	`1`	`+#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`2`	`2`	`MAINTAINER Selenium <[email protected]>`
`3`	`3`
`4`	`4`	`USER root`