merge conflicts

vccw-team · Nov 13, 2016 · 5d8ef81 · 5d8ef81
2 parents 5c3546e + 6238c3d
commit 5d8ef81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -8,6 +8,12 @@
     "autoload": {
         "files": [ "cli.php" ]
     },
+    "scripts": {
+        "install-phpunit-env": "bash bin/install-wp-tests.sh wordpress_test root '' localhost latest",
+        "install-behat-env": "WP_CLI_BIN_DIR=/tmp/wp-cli-phar bash bin/install-package-tests.sh",
+        "setup": "composer run install-phpunit-env && composer run install-behat-env",
+        "test": "phpunit && WP_CLI_BIN_DIR=/tmp/wp-cli-phar behat"
+    },
     "require": {
         "wp-cli/wp-cli": ">=0.23.0",
         "phpunit/phpunit": "^4.8"

diff --git a/composer.lock b/composer.lock