Merge branch '2.2' into master

.travis.yml

@@ -22,8 +22,10 @@ env:
     - TEST_CMD="bin/behat -vv --profile=rest --suite=fullXml --tags=~@broken"
     - TEST_CMD="bin/behat -vv --profile=core --tags=~@broken"
     - TEST_CMD="bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" SYMFONY_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'"
-    - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
-    - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish"
+    - TEST_CMD="bin/behat -vv --profile=adminui --suite=adminui" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
+    - TEST_CMD="bin/behat -vv --profile=adminui --suite=adminui --tags=~@EZP-29291-excluded" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish"
+    - TEST_CMD="bin/behat -vv --profile=repository-forms" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
+
 
 # test only master (+ Pull requests)
 branches:

bin/.travis/trusty/setup_ezplatform.sh

@@ -91,7 +91,7 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
 fi
 
 echo '> Run composer install inside docker app container'
-docker-compose exec app sh -c 'composer install --no-suggest --no-progress --no-interaction --prefer-dist --optimize-autoloader'
+docker-compose exec app sh -c 'php -d memory_limit='3G' /usr/local/bin/composer install --no-suggest --no-progress --no-interaction --prefer-dist --optimize-autoloader'
 
 # for behat builds to work
 echo '> Change ownership of files inside docker container'

tests/AppBundle/Behat/PlatformDemoEnvironmentConstants.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace Tests\AppBundle\Behat;
+use EzSystems\EzPlatformAdminUi\Behat\Helper\PlatformEnvironmentConstants;
+class PlatformDemoEnvironmentConstants extends PlatformEnvironmentConstants
+{
+    /** @var string[] */
+    public $values;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->values['ROOT_CONTENT_NAME'] = 'Home';
+        $this->values['ARTICLE_MAIN_FIELD_NAME'] = 'Summary';
+        $this->values['CREATE_REGISTRATION_ROLE_POLICIES'] = 'user/login,content/read,tags/read';
+        $this->values['REGISTRATION_CONFIRMATION_MESSAGE'] = 'Registration completed';
+    }
+}