Fix for #736: Expect response code 200 for Selenium containers versio…

…n >= 3 (#760) * Fix for #736: Expect response code 200 for Selenium containers version 3 onwards * Fix for #736: get used Selenium version from classpath and extracted logic to dedicated method * Inlined expected response code * Removed unnecessary line break
arquillian · Jul 18, 2017 · 7867a24 · 7867a24
1 parent 9fa4714
commit 7867a24
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/docker/drone/src/main/java/org/arquillian/cube/docker/drone/SeleniumContainers.java b/docker/drone/src/main/java/org/arquillian/cube/docker/drone/SeleniumContainers.java
@@ -159,15 +159,28 @@ private static void setDefaultSeleniumCubeProperties(CubeContainer cubeContainer
 
         Await await = new Await();
         await.setStrategy("http");
-        // Doing an http request to selenium node returns a 403 if Jetty is up and running
-        await.setResponseCode(403);
+        await.setResponseCode(getSeleniumExpectedResponseCode());
         await.setUrl("http://dockerHost:" + SELENIUM_BOUNDED_PORT);
 
         cubeContainer.setAwait(await);
 
         cubeContainer.setKillContainer(true);
     }
 
+    private static int getSeleniumExpectedResponseCode(){
+        // Selenium from 3.x onwards returns 200 if started
+        int expectedResponseCode = 200;
+            String seleniumVersion = SeleniumVersionExtractor.fromClassPath();
+            if(seleniumVersion.matches("[0-9]+\\.?.*")){
+                int seleniumMajorVersion = Integer.parseInt(seleniumVersion.substring(0, seleniumVersion.indexOf('.')));
+                if(seleniumMajorVersion < 3){
+                    // Doing an http request to selenium node returns a 403 if Jetty is up and running for Selenium < 3
+                    expectedResponseCode = 403;
+                }
+        }
+        return expectedResponseCode;
+    }
+
     public CubeContainer getSeleniumContainer() {
         return seleniumContainer;
     }

diff --git a/docker/drone/src/test/java/org/arquillian/cube/docker/drone/SeleniumContainersTest.java b/docker/drone/src/test/java/org/arquillian/cube/docker/drone/SeleniumContainersTest.java
@@ -66,6 +66,7 @@ public void shouldCreateContainerForFirefox() {
         assertThat(firefox.getBrowser(), is("firefox"));
         assertThat(firefox.getSeleniumContainer().getImage().toString(), is("selenium/standalone-firefox-debug:2.53.0"));
         assertThat(firefox.getSeleniumContainer().getPortBindings(), hasItem(PortBinding.valueOf("14444->4444")));
+        assertThat(firefox.getSeleniumContainer().getAwait().getResponseCode(), is(403));
     }
 
     @Test
@@ -78,5 +79,6 @@ public void shouldCreateContainerForChrome() {
         assertThat(firefox.getBrowser(), is("chrome"));
         assertThat(firefox.getSeleniumContainer().getImage().toString(), is("selenium/standalone-chrome-debug:2.53.0"));
         assertThat(firefox.getSeleniumContainer().getPortBindings(), hasItem(PortBinding.valueOf("14444->4444")));
+        assertThat(firefox.getSeleniumContainer().getAwait().getResponseCode(), is(403));
     }
 }