merge master

vccw-team · Dec 23, 2016 · faa2535 · faa2535
2 parents b7cf334 + eb1a79e
commit faa2535
Show file tree

Hide file tree

Showing 9 changed files with 641 additions and 17 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.php]
+indent_style = tab
+indent_size = 4
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+export WP_VERSION=latest
+export WP_THEME=twentysixteen
+export WP_PATH=/tmp/wp-tests
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ package.json
 phpspec.yml
 spec/
 vendor/
+wp-cli.yml
 wp-cli-nightly.phar
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ Feature: I login as the specfic role
 Run to see contexts.
 
 ```
-$ vendor/bin/behat --di --lang=en
+$ vendor/bin/behat -di --lang=en
 ```
 
 ### Install headless browser

diff --git a/composer.json b/composer.json
@@ -13,7 +13,9 @@
         "behat/mink": "~1.7",
         "behat/mink-extension": "~2.2",
         "behat/mink-selenium2-driver": "~1.3.1",
-        "phpunit/phpunit": "^5.6"
+        "phpunit/phpunit": "^5.6",
+        "behat/mink-goutte-driver": "^1.2",
+        "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
         "phpspec/phpspec": "^3.1"