Merge pull request #193 from wp-cli/fix-gherkin-issues

Fix Gherkin lint issues

Author: swissspidy

features/config-create.feature

@@ -292,4 +292,3 @@ Feature: Create a wp-config file
       """
       PasswordWith'SingleQuotes'
       """
-

features/config-is-true.feature

@@ -37,7 +37,7 @@ Feature: Determine whether the value of a constant or variable defined in wp-con
   Scenario Outline: Get the value of a variable whose value is true
     When I try `wp config is-true <variable>`
     Then STDOUT should be empty
-    Then STDERR should be empty
+    And STDERR should be empty
     And the return code should be 0
 
     Examples:
@@ -75,10 +75,9 @@ Feature: Determine whether the value of a constant or variable defined in wp-con
   Scenario: Test for correct functionality with included PHP files.
     When I try `wp config is-true WP_INC_TRUTH`
     Then STDOUT should be empty
-    Then STDERR should be empty
+    And STDERR should be empty
     And the return code should be 0
 
     When I try `wp config is-true WP_INC_FALSE`
     Then STDOUT should be empty
     And the return code should be 1
-

features/config-list.feature

@@ -100,11 +100,11 @@ Feature: List the values of a wp-config.php file
       | DB_HOST     |
       | DB_CHARSET  |
       | DB_COLLATE  |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
@@ -113,15 +113,15 @@ Feature: List the values of a wp-config.php file
     Then STDOUT should be a table containing rows:
       | name    |
       | DB_HOST |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_NAME
       """
@@ -143,15 +143,15 @@ Feature: List the values of a wp-config.php file
       | name        |
       | DB_USER     |
       | DB_PASSWORD |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """
@@ -161,15 +161,15 @@ Feature: List the values of a wp-config.php file
       | name        |
       | DB_USER     |
       | DB_PASSWORD |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """
@@ -185,11 +185,11 @@ Feature: List the values of a wp-config.php file
       | SECURE_AUTH_SALT |
       | LOGGED_IN_SALT   |
       | NONCE_SALT       |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """
@@ -232,11 +232,11 @@ Feature: List the values of a wp-config.php file
       | DB_HOST     |
       | DB_CHARSET  |
       | DB_COLLATE  |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
@@ -245,15 +245,15 @@ Feature: List the values of a wp-config.php file
     Then STDOUT should be a table containing rows:
       | name    |
       | DB_HOST |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_NAME
       """
@@ -275,15 +275,15 @@ Feature: List the values of a wp-config.php file
       | name        |
       | DB_USER     |
       | DB_PASSWORD |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """
@@ -293,15 +293,15 @@ Feature: List the values of a wp-config.php file
       | name        |
       | DB_USER     |
       | DB_PASSWORD |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       AUTH_KEY
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """
@@ -317,11 +317,11 @@ Feature: List the values of a wp-config.php file
       | SECURE_AUTH_SALT |
       | LOGGED_IN_SALT   |
       | NONCE_SALT       |
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       table_prefix
       """
-    Then STDOUT should not contain:
+    And STDOUT should not contain:
       """
       DB_HOST
       """

features/config-set.feature

@@ -383,7 +383,7 @@ Feature: Set the value of a constant or variable defined in wp-config.php file a
       require_once( ABSPATH . 'wp-settings.php' );
       """
 
-    Scenario: Additions can be properly placed in wp-custom-config.php
+  Scenario: Additions can be properly placed in wp-custom-config.php
     Given a WP install
     And a wp-custom-config.php file:
       """