Merge branch '1.13' into 2.2

ezecosystem · Sep 21, 2018 · 4e28ae2 · 4e28ae2
2 parents 1d7847e + 7c35440
commit 4e28ae2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -26,6 +26,13 @@ default:
 
         EzSystems\PlatformBehatBundle\ServiceContainer\EzBehatExtension: ~
 
+        Bex\Behat\ScreenshotExtension:
+            active_image_drivers: cloudinary
+            image_drivers:
+                cloudinary:
+                    cloud_name: ezplatformtravis
+                    preset: ezplatform
+
     suites: ~
 
 imports:

diff --git a/bin/.travis/runcommand.sh b/bin/.travis/runcommand.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "" ]; then
+    echo "Argument 1 variable for command arguments is empty, please pass arguments"
+    exit 1
+fi
+
+# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
+CMD=\"$@\"
+docker-compose exec -T --user www-data app bash -c \""$CMD"\"
diff --git a/composer.json b/composer.json
@@ -73,7 +73,9 @@
         "ezsystems/behatbundle": "^6.5.3",
         "phpunit/phpunit": "^6.4.4",
         "sensio/generator-bundle": "^3.1.7",
-        "symfony/phpunit-bridge": "^3.4.11"
+        "symfony/phpunit-bridge": "^3.4.11",
+        "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0",
+        "bex/behat-screenshot": "^1.2"
     },
     "conflict": {
         "symfony/symfony": "3.4.9||3.4.12",

diff --git a/doc/docker/base-dev.yml b/doc/docker/base-dev.yml
@@ -10,6 +10,7 @@ services:
     depends_on:
      - db
     environment:
+     - COMPOSER_MEMORY_LIMIT
      - SYMFONY_ENV=${SYMFONY_ENV-dev}
      - SYMFONY_DEBUG
      - SYMFONY_HTTP_CACHE

diff --git a/doc/docker/base-prod.yml b/doc/docker/base-prod.yml
@@ -11,6 +11,7 @@ services:
     depends_on:
      - db
     environment:
+     - COMPOSER_MEMORY_LIMIT
      - SYMFONY_ENV=${SYMFONY_ENV-prod}
      - SYMFONY_DEBUG
      - SYMFONY_HTTP_CACHE