Merge branch '2.3' into 2.4

.travis.yml

@@ -44,20 +44,20 @@ matrix:
           env:
             - TEST_CMD="php bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional"
             - SYMFONY_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'"
-        - name: "Repository Forms tests on Clean EE"
+        - name: "Repository Forms tests on Clean Platform"
           env:
             - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
             - TEST_CMD="./bin/behat -v --no-interaction --colors --profile=repository-forms --tags=~@broken"
         - name: "Behat"
           env: TEST_CMD="bin/behat -v --profile=behat --tags=~@broken"
-        - name: "Admin UI on Clean EE"
+        - name: "Admin UI on Clean Platform"
           env:
             - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
-            - TEST_CMD="./bin/.travis/get_behat_features.sh adminui | bin/fastest -o -v \"bin/behat {} --suite=adminui --no-interaction -vv --strict\""
-        - name: "Admin UI on Clean EE with Varnish and Redis"
+            - TEST_CMD="./bin/.travis/get_behat_features.sh -p adminui -s adminui | bin/fastest -o -v \"bin/behat {} --profile=adminui --suite=adminui --no-interaction -vv --strict\""
+        - name: "Admin UI on Clean Platform with Varnish and Redis"
           env:
             - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml"
-            - TEST_CMD="./bin/.travis/get_behat_features.sh adminui | bin/fastest -o -v \"bin/behat {} --suite=adminui --no-interaction -vv --strict --tags=~@EZP-29291-excluded\""
+            - TEST_CMD="./bin/.travis/get_behat_features.sh -p adminui -s adminui -t ~@EZP-29291-excluded | bin/fastest -o -v \"bin/behat {} --profile=adminui --suite=adminui --no-interaction -vv --strict\""
             - WEB_HOST="varnish"
 
 notifications:

bin/.travis/get_behat_features.sh

@@ -4,5 +4,18 @@
 # times each build, often non optimal. To make this optimal we sort features by the number of scenarios in them
 # (ascending because Fastest reverse the queue order, and we want this queue to run descending) and run them in that order,
 # to minimize final time gap between the threads.
+PROFILE=''
+SUITE=''
+TAGS=''
 
-bin/behat --suite=$1 --list-scenarios | awk '{ gsub(/:[0-9]+/,"",$1); print $1 }' | uniq -c | sort | awk '{ print $2 }'
+while getopts p:s:t: option
+do
+case "${option}"
+in
+p) PROFILE="--profile=${OPTARG}";;
+s) SUITE="--suite=${OPTARG}";;
+t) TAGS="--tags=${OPTARG}";;
+esac
+done
+
+bin/behat ${PROFILE} ${SUITE} ${TAGS} --list-scenarios | awk '{ gsub(/:[0-9]+/,"",$1); print $1 }' | uniq -c | sort | awk '{ print $2 }'