From ad41a83016903a1bf9a5f9dd489382999f77c2ac Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Fri, 8 Dec 2017 05:34:15 -0800
Subject: [PATCH] Update scaffolded tests and README to latest

---
 .travis.yml                           |  3 +--
 README.md                             |  2 +-
 features/bootstrap/FeatureContext.php |  8 ++++----
 features/steps/given.php              | 14 +++++++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b65648735..697bac1b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ branches:
 
 cache:
   directories:
-    - vendor
     - $HOME/.composer/cache
 
 env:
@@ -25,7 +24,7 @@ env:
 matrix:
   include:
     - php: 7.2
-      env: WP_VERSION=nightly
+      env: WP_VERSION=latest
     - php: 7.1
       env: WP_VERSION=latest
     - php: 7.0
diff --git a/README.md b/README.md
index cff0183ec..ab1db0dc4 100644
--- a/README.md
+++ b/README.md
@@ -321,7 +321,7 @@ Once you've decided to commit the time to seeing your pull request through, [ple
 
 ## Support
 
-Github issues aren't for general support questions, but there are other venues you can try: http://wp-cli.org/#support
+Github issues aren't for general support questions, but there are other venues you can try: https://wp-cli.org/#support
 
 
 *This README.md is generated dynamically from the project's codebase using `wp scaffold package-readme` ([doc](https://github.com/wp-cli/scaffold-package-command#wp-scaffold-package-readme)). To suggest changes, please submit a pull request against the corresponding part of the codebase.*
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
index 453c604ee..b74d7668e 100644
--- a/features/bootstrap/FeatureContext.php
+++ b/features/bootstrap/FeatureContext.php
@@ -45,17 +45,17 @@
 class FeatureContext extends BehatContext implements ClosuredContextInterface {
 
 	/**
-	 * The current working directory for scenarios that have a "Given a WP install" or "Given an empty directory" step. Variable RUN_DIR. Lives until the end of the scenario.
+	 * The current working directory for scenarios that have a "Given a WP installation" or "Given an empty directory" step. Variable RUN_DIR. Lives until the end of the scenario.
 	 */
 	private static $run_dir;
 
 	/**
-	 * Where WordPress core is downloaded to for caching, and which is copied to RUN_DIR during a "Given a WP install" step. Lives until manually deleted.
+	 * Where WordPress core is downloaded to for caching, and which is copied to RUN_DIR during a "Given a WP installation" step. Lives until manually deleted.
 	 */
 	private static $cache_dir;
 
 	/**
-	 * The directory that holds the install cache, and which is copied to RUN_DIR during a "Given a WP install" step. Recreated on each suite run.
+	 * The directory that holds the install cache, and which is copied to RUN_DIR during a "Given a WP installation" step. Recreated on each suite run.
 	 */
 	private static $install_cache_dir;
 
@@ -72,7 +72,7 @@ class FeatureContext extends BehatContext implements ClosuredContextInterface {
 	private static $composer_local_repository;
 
 	/**
-	 * The test database settings. All but `dbname` can be set via environment variables. The database is dropped at the start of each scenario and created on a "Given a WP install" step.
+	 * The test database settings. All but `dbname` can be set via environment variables. The database is dropped at the start of each scenario and created on a "Given a WP installation" step.
 	 */
 	private static $db_settings = array(
 		'dbname' => 'wp_cli_test',
diff --git a/features/steps/given.php b/features/steps/given.php
index f2eae113f..3e501c2c7 100644
--- a/features/steps/given.php
+++ b/features/steps/given.php
@@ -69,31 +69,31 @@ function ( $world ) {
 	}
 );
 
-$steps->Given( '/^a WP install$/',
+$steps->Given( '/^a WP (install|installation)$/',
 	function ( $world ) {
 		$world->install_wp();
 	}
 );
 
-$steps->Given( "/^a WP install in '([^\s]+)'$/",
-	function ( $world, $subdir ) {
+$steps->Given( "/^a WP (install|installation) in '([^\s]+)'$/",
+	function ( $world, $_, $subdir ) {
 		$world->install_wp( $subdir );
 	}
 );
 
-$steps->Given( '/^a WP install with Composer$/',
+$steps->Given( '/^a WP (install|installation) with Composer$/',
 	function ( $world ) {
 		$world->install_wp_with_composer();
 	}
 );
 
-$steps->Given( "/^a WP install with Composer and a custom vendor directory '([^\s]+)'$/",
-	function ( $world, $vendor_directory ) {
+$steps->Given( "/^a WP (install|installation) with Composer and a custom vendor directory '([^\s]+)'$/",
+	function ( $world, $_, $vendor_directory ) {
 		$world->install_wp_with_composer( $vendor_directory );
 	}
 );
 
-$steps->Given( '/^a WP multisite (subdirectory|subdomain)?\s?install$/',
+$steps->Given( '/^a WP multisite (subdirectory|subdomain)?\s?(install|installation)$/',
 	function ( $world, $type = 'subdirectory' ) {
 		$world->install_wp();
 		$subdomains = ! empty( $type ) && 'subdomain' === $type ? 1 : 0;