Merge pull request #284 from wp-cli/refine-feature-files

Fix Gherkin lint issues

Author: swissspidy

features/core-download.feature

@@ -39,9 +39,9 @@ Feature: Download WordPress
     When I run `wp core download --force`
     Then the wp-settings.php file should exist
     And STDOUT should contain:
-    """
-    Using cached file '{SUITE_CACHE_DIR}/core/wordpress-{VERSION}-en_US.tar.gz'...
-    """
+      """
+      Using cached file '{SUITE_CACHE_DIR}/core/wordpress-{VERSION}-en_US.tar.gz'...
+      """
 
   Scenario: Localized install
     Given an empty directory
@@ -115,17 +115,18 @@ Feature: Download WordPress
 
   Scenario: Make sure files are cleaned up
     Given an empty directory
+
     When I run `wp core download --version=4.4`
     Then the wp-includes/rest-api.php file should exist
-    Then the wp-includes/class-wp-comment.php file should exist
+    And the wp-includes/class-wp-comment.php file should exist
     And STDERR should not contain:
       """
       Warning: Failed to find WordPress version. Please cleanup files manually.
       """
 
     When I run `wp core download --version=4.3.2 --force`
     Then the wp-includes/rest-api.php file should not exist
-    Then the wp-includes/class-wp-comment.php file should not exist
+    And the wp-includes/class-wp-comment.php file should not exist
     And STDOUT should not contain:
       """
       File removed: wp-content
@@ -238,9 +239,9 @@ Feature: Download WordPress
     When I try `wp core download --version=nightly --locale=de_DE`
     Then the return code should be 1
     And STDERR should contain:
-    """
-    Error: Nightly builds are only available for the en_US locale.
-    """
+      """
+      Error: Nightly builds are only available for the en_US locale.
+      """
 
   Scenario: Installing a release candidate or beta version
     Given an empty directory
@@ -249,7 +250,7 @@ Feature: Download WordPress
     # Test with incorrect case.
     When I try `wp core download --version=4.6-rc2`
     Then the return code should be 1
-    Then STDERR should contain:
+    And STDERR should contain:
       """
       Error: Release not found.
       """
@@ -281,62 +282,62 @@ Feature: Download WordPress
   Scenario: Fail if path can't be created
     Given an empty directory
     And a non-directory-path file:
-    """
-    """
+      """
+      """
 
     When I try `wp core download --path=non-directory-path`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    /non-directory-path/
-    """
+      """
+      /non-directory-path/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=non-directory-path`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    non-directory-path/
-    """
+      """
+      non-directory-path/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=non-directory-path\\`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    non-directory-path/
-    """
+      """
+      non-directory-path/
+      """
     And the return code should be 1
 
     When I try `wp core download --path=/root-level-directory`
     Then STDERR should contain:
-    """
-    Insufficient permission to create directory
-    """
+      """
+      Insufficient permission to create directory
+      """
     And STDERR should contain:
-    """
-    /root-level-directory/
-    """
+      """
+      /root-level-directory/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=/root-level-directory`
     Then STDERR should contain:
-    """
-    Insufficient permission to create directory
-    """
+      """
+      Insufficient permission to create directory
+      """
     And STDERR should contain:
-    """
-    /root-level-directory/
-    """
+      """
+      /root-level-directory/
+      """
     And the return code should be 1
 
   Scenario: Core download without the full wp-content/plugins dir
@@ -366,9 +367,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
 
   Scenario: Core download without the full wp-content/plugins dir should work non US locale
@@ -382,9 +383,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/plugins directory should exist
     And the wp-content/plugins directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/plugins directory should exist
 
   Scenario: Core download without the full wp-content/themes dir should work non US locale
@@ -398,9 +399,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
 
   Scenario: Core download without the full wp-content/plugins dir should work if a version is set
@@ -414,14 +415,14 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/plugins directory should exist
     And the wp-content/plugins directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
     And the wp-includes/js/tinymce/plugins directory should exist
 
@@ -474,12 +475,12 @@ Feature: Download WordPress
       """
     And the return code should be 1
 
-    Scenario: Allow installing major version with trailing zero
+  Scenario: Allow installing major version with trailing zero
     Given an empty directory
 
     When I run `wp core download --version=6.7.0`
     Then STDOUT should contain:
-    """
-    Success:
-    """
+      """
+      Success:
+      """
 

features/core-install.feature

@@ -195,17 +195,17 @@ Feature: Install WordPress core
 
     When I run `wp config create --dbname={DB_NAME} --dbuser={DB_USER} --dbpass={DB_PASSWORD} --dbhost={DB_HOST} --locale=de_DE --skip-check`
     Then STDOUT should be:
-    """
-    Success: Generated 'wp-config.php' file.
-    """
+      """
+      Success: Generated 'wp-config.php' file.
+      """
 
     # Old versions of WP can generate wpdb database errors if the WP tables don't exist, so STDERR may or may not be empty
     When I try `wp core install --url=example.org --title=Test --admin_user=testadmin --admin_email=testadmin@example.com --admin_password=newpassword --locale=de_DE --skip-email`
     Then STDERR should contain:
       """
       Warning: The flag --locale=de_DE is being ignored as it requires WordPress 4.0+.
       """
-    Then STDOUT should contain:
+    And STDOUT should contain:
       """
       Success: WordPress installed successfully.
       """
@@ -241,9 +241,9 @@ Feature: Install WordPress core
 
     When I run `wp config create --dbname={DB_NAME} --dbuser={DB_USER} --dbpass={DB_PASSWORD} --dbhost={DB_HOST} --locale=de_DE --skip-check`
     Then STDOUT should be:
-    """
-    Success: Generated 'wp-config.php' file.
-    """
+      """
+      Success: Generated 'wp-config.php' file.
+      """
 
     # Old versions of WP can generate wpdb database errors if the WP tables don't exist, so STDERR may or may not be empty
     When I run `wp core install --url=example.org --title=Test --admin_user=testadmin --admin_email=testadmin@example.com --admin_password=newpassword --locale=de_DE --skip-email`
@@ -290,9 +290,9 @@ Feature: Install WordPress core
 
     When I run `wp core multisite-install --url=foobar.org --title=Test --admin_user=wpcli --admin_email=admin@example.com --admin_password=password --skip-config`
     Then STDOUT should contain:
-    """
-    Addition of multisite constants to 'wp-config.php' skipped. You need to add them manually:
-    """
+      """
+      Addition of multisite constants to 'wp-config.php' skipped. You need to add them manually:
+      """
 
   @require-mysql
   Scenario: Install WordPress multisite with existing multisite constants in wp-config file

features/core-update.feature

@@ -228,18 +228,19 @@ Feature: Update WordPress core
   Scenario: Make sure files are cleaned up
     Given a WP install
     And I try `wp theme install twentytwenty --activate`
+
     When I run `wp core update --version=4.4 --force`
     Then the wp-includes/rest-api.php file should exist
-    Then the wp-includes/class-wp-comment.php file should exist
+    And the wp-includes/class-wp-comment.php file should exist
     And STDOUT should not contain:
       """
       File removed: wp-content
       """
 
     When I run `wp core update --version=4.3.2 --force`
     Then the wp-includes/rest-api.php file should not exist
-    Then the wp-includes/class-wp-comment.php file should not exist
-    Then STDOUT should contain:
+    And the wp-includes/class-wp-comment.php file should not exist
+    And STDOUT should contain:
       """
       File removed: wp-includes/class-walker-comment.php
       File removed: wp-includes/class-wp-network.php
@@ -267,13 +268,13 @@ Feature: Update WordPress core
 
     When I run `wp core update --version=5.8 --force`
     Then the wp-includes/Requests/Transport/cURL.php file should exist
-    Then the wp-includes/Requests/Exception/Transport/cURL.php file should exist
-    Then the wp-includes/Requests/Exception/HTTP/502.php file should exist
-    Then the wp-includes/Requests/IRI.php file should exist
-    Then the wp-includes/Requests/src/Transport/Curl.php file should not exist
-    Then the wp-includes/Requests/src/Exception/Transport/Curl.php file should not exist
-    Then the wp-includes/Requests/src/Exception/Http/Status502.php file should not exist
-    Then the wp-includes/Requests/src/Iri.php file should not exist
+    And the wp-includes/Requests/Exception/Transport/cURL.php file should exist
+    And the wp-includes/Requests/Exception/HTTP/502.php file should exist
+    And the wp-includes/Requests/IRI.php file should exist
+    And the wp-includes/Requests/src/Transport/Curl.php file should not exist
+    And the wp-includes/Requests/src/Exception/Transport/Curl.php file should not exist
+    And the wp-includes/Requests/src/Exception/Http/Status502.php file should not exist
+    And the wp-includes/Requests/src/Iri.php file should not exist
     And STDOUT should contain:
       """
       Cleaning up files...
@@ -285,13 +286,13 @@ Feature: Update WordPress core
 
     When I run `wp core update --version=6.2 --force`
     Then the wp-includes/Requests/Transport/cURL.php file should not exist
-    Then the wp-includes/Requests/Exception/Transport/cURL.php file should not exist
-    Then the wp-includes/Requests/Exception/HTTP/502.php file should not exist
-    Then the wp-includes/Requests/IRI.php file should not exist
-    Then the wp-includes/Requests/src/Transport/Curl.php file should exist
-    Then the wp-includes/Requests/src/Exception/Transport/Curl.php file should exist
-    Then the wp-includes/Requests/src/Exception/Http/Status502.php file should exist
-    Then the wp-includes/Requests/src/Iri.php file should exist
+    And the wp-includes/Requests/Exception/Transport/cURL.php file should not exist
+    And the wp-includes/Requests/Exception/HTTP/502.php file should not exist
+    And the wp-includes/Requests/IRI.php file should not exist
+    And the wp-includes/Requests/src/Transport/Curl.php file should exist
+    And the wp-includes/Requests/src/Exception/Transport/Curl.php file should exist
+    And the wp-includes/Requests/src/Exception/Http/Status502.php file should exist
+    And the wp-includes/Requests/src/Iri.php file should exist
     And STDOUT should contain:
       """
       Cleaning up files...
@@ -318,9 +319,9 @@ Feature: Update WordPress core
       """
 
     Examples:
-    | version    |
-    | trunk      |
-    | nightly    |
+      | version    |
+      | trunk      |
+      | nightly    |
 
   @require-php-7.2
   Scenario: Installing latest nightly build should skip cache
@@ -353,8 +354,6 @@ Feature: Update WordPress core
 
     When I run `wp core update --version=6.2.0 --force`
     Then STDOUT should contain:
-    """
-    Success:
-    """
-
-
+      """
+      Success:
+      """