Merge remote-tracking branch 'origin/3.0' into 3.0

ezsystems · May 5, 2020 · 47d3637 · 47d3637
2 parents 9d6d005 + 73cdee3
commit 47d3637
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.env b/.env
@@ -14,7 +14,7 @@ PHP_IMAGE=ezsystems/php:7.3-v1
 PHP_IMAGE_DEV=ezsystems/php:7.3-v1-dev
 NGINX_IMAGE=nginx:stable
 MYSQL_IMAGE=healthcheck/mariadb
-SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.141.59-oxygen
+SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.141.59-20200326
 CHROMIUM_IMAGE=registry.gitlab.com/dmore/docker-chrome-headless:7.1
 REDIS_IMAGE=healthcheck/redis
 

diff --git a/.platform/varnish.vcl b/.platform/varnish.vcl
@@ -5,7 +5,7 @@
 //
 
 // Not applicable on Platform.sh:
-//vcl 4.1;
+//vcl 4.0;
 //import std;
 import xkey;
 
@@ -201,7 +201,7 @@ sub ez_user_context_hash {
             || req.http.x-user-context-hash
         )
     ) {
-        return (synth(400));
+        return (synth(400, "Bad Request"));
     }
 
     if (req.restarts == 0 && (req.method == "GET" || req.method == "HEAD")) {
@@ -249,7 +249,7 @@ sub ez_invalidate_token {
             || req.http.x-backend-invalidate-token
         )
     ) {
-        return (synth(400));
+        return (synth(400, "Bad Request"));
     }
 
     if (req.restarts == 0 && (req.method == "PURGE" || req.method == "PURGEKEYS") && req.http.x-invalidate-token) {

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -18,6 +18,7 @@ default:
                         capabilities:
                             extra_capabilities:
                                 chromeOptions:
+                                    w3c: false
                                     args:
                                         - "--window-size=1440,1080"
                                         - "--no-sandbox"