Merge pull request #101 from wp-cli/scaffold-tests-readme-12-8

Update scaffolded tests and README to latest

.travis.yml

@@ -24,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

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',

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;