Merge pull request #15 from wp-cli/12-automated-rerun-support

Add rerun-behat-tests command

Author: schlessera

README.md

@@ -19,10 +19,11 @@ To make use of the WP-CLI testing framework, you need to complete the following
 2. Add the required test scripts to the `composer.json` file:
 	```json
 	"scripts": {
+        "behat": "run-behat-tests",
+        "behat-rerun": "rerun-behat-tests",
         "lint": "run-linter-tests",
         "phpcs": "run-phpcs-tests",
         "phpunit": "run-php-unit-tests",
-        "behat": "run-behat-tests",
         "prepare-tests": "install-package-tests",
         "test": [
             "@lint",

bin/rerun-behat-tests

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Run the Behat tests only if a features folder exists
+if [ ! -d "features" ]; then
+  exit 0;
+fi
+
+# Turn WP_VERSION into an actual number to make sure our tags work correctly.
+if [ "${WP_VERSION-latest}" = "latest" ]; then
+	export WP_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq -r ".offers[0].current")
+fi
+
+# To retrieve the Behat root folder, we start with this scripts location
+SOURCE="${BASH_SOURCE[0]}"
+
+# Resolve $SOURCE until the file is no longer a symlink
+while [ -h "$SOURCE" ]; do
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  # If $SOURCE was a relative symlink, we need to resolve it relative to the
+  # path where the symlink file was located
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+done
+
+# Fetch the root folder of the Behat package
+BEHAT_ROOT="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+export BEHAT_ROOT
+
+# Set Behat environment variables
+BEHAT_PARAMS="paths[bootstrap]=$(php -r "echo urlencode('$BEHAT_ROOT/features/bootstrap');")"
+export BEHAT_PARAMS
+
+# Generate the tags to apply environment-specific filters
+BEHAT_TAGS=$(php "$BEHAT_ROOT"/utils/behat-tags.php)
+
+# Run the functional tests
+vendor/bin/behat --format progress "$BEHAT_TAGS" --strict --ansi --rerun=".behat-progress.log" "$@"

bin/run-behat-tests

@@ -5,6 +5,8 @@ if [ ! -d "features" ]; then
   exit 0;
 fi
 
+rm -f ".behat-progress.log"
+
 # Turn WP_VERSION into an actual number to make sure our tags work correctly.
 if [ "${WP_VERSION-latest}" = "latest" ]; then
 	export WP_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq -r ".offers[0].current")
@@ -34,4 +36,4 @@ export BEHAT_PARAMS
 BEHAT_TAGS=$(php "$BEHAT_ROOT"/utils/behat-tags.php)
 
 # Run the functional tests
-vendor/bin/behat --format progress "$BEHAT_TAGS" --strict --ansi "$@"
+vendor/bin/behat --format progress "$BEHAT_TAGS" --strict --ansi --rerun=".behat-progress.log" "$@"

composer.json

@@ -48,13 +48,15 @@
     "prefer-stable": true,
     "bin": [
         "bin/install-package-tests",
+        "bin/rerun-behat-tests",
         "bin/run-behat-tests",
         "bin/run-linter-tests",
         "bin/run-php-unit-tests",
         "bin/run-phpcs-tests"
     ],
     "scripts": {
         "behat": "run-behat-tests",
+        "behat-rerun": "rerun-behat-tests",
         "lint": "run-linter-tests",
         "phpcs": "run-phpcs-tests",
         "phpunit": "run-php-unit-tests",