Merge branch '1.11'

ezpublishlegacy · Aug 30, 2017 · 4ffa6c9 · 4ffa6c9
2 parents 59f096a + 4666c71
commit 4ffa6c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.env b/.env
@@ -13,7 +13,7 @@ PHP_IMAGE=ezsystems/php:7.1-v1
 PHP_IMAGE_DEV=ezsystems/php:7.1-v1-dev
 NGINX_IMAGE=nginx:stable
 MYSQL_IMAGE=healthcheck/mariadb
-SELENIUM_IMAGE=selenium/standalone-firefox:2.53.1
+SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.4.0
 REDIS_IMAGE=healthcheck/redis
 
 # App image name for use if you intend to push it to docker registry/hub.

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -6,10 +6,16 @@ default:
         Behat\MinkExtension:
             base_url: 'http://localhost'
             goutte: ~
+            javascript_session: selenium2
             selenium2:
+                browser: chrome
                 wd_host: 'http://localhost:4444/wd/hub'
-            javascript_session: selenium2
-            browser_name: firefox
+                capabilities:
+                    extra_capabilities:
+                        chromeOptions:
+                            args:
+                                - "--window-size=1440,1080"
+                                - "--no-sandbox"
 
         Behat\Symfony2Extension:
             kernel:

diff --git a/doc/docker/selenium.yml b/doc/docker/selenium.yml
@@ -13,6 +13,8 @@ services:
      - SCREEN_DEPTH=24
     networks:
      - backend
+    # Because of: https://github.com/elgalu/docker-selenium/issues/20
+    shm_size: 1g 
 
   app:
     depends_on: