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

Fix Gherkin lint issues

Author: swissspidy

features/db-import.feature

@@ -79,8 +79,7 @@ Feature: Import a WordPress database
 
   Scenario: Import database with passed-in options
     Given a WP install
-
-    Given a debug.sql file:
+    And a debug.sql file:
       """
       INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (999, 'testoption',  'testval',  'yes'),(999, 'testoption',  'testval',  'yes');
       """

features/db-query.feature

@@ -31,7 +31,7 @@ Feature: Query the database with WordPress' MySQL config
       """
 
     When I try `wp db query "SELECT COUNT(ID) FROM wp_posts;" --dbuser=no_such_user`
-	Then the return code should not be 0
+    Then the return code should not be 0
     And STDERR should contain:
       """
       Access denied
@@ -48,7 +48,7 @@ Feature: Query the database with WordPress' MySQL config
       """
 
     When I try `wp db query --defaults "SELECT COUNT(ID) FROM wp_posts;" --dbuser=no_such_user`
-	Then the return code should not be 0
+    Then the return code should not be 0
     And STDERR should contain:
       """
       Access denied
@@ -65,7 +65,7 @@ Feature: Query the database with WordPress' MySQL config
       """
 
     When I try `wp db query --no-defaults "SELECT COUNT(ID) FROM wp_posts;" --dbuser=no_such_user`
-	Then the return code should not be 0
+    Then the return code should not be 0
     And STDERR should contain:
       """
       Access denied
@@ -75,7 +75,7 @@ Feature: Query the database with WordPress' MySQL config
   Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 
-  When I try `wp db query --defaults --debug`
+    When I try `wp db query --defaults --debug`
     Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-auto-rehash#
 
     When I try `wp db query --debug`

features/db-search.feature

@@ -265,8 +265,7 @@ Feature: Search through the database
 
     When I run `wp db query "CREATE TABLE no_key ( awesome_stuff TEXT );"`
     And I run `wp db query "CREATE TABLE no_text ( id int(11) unsigned NOT NULL AUTO_INCREMENT, PRIMARY KEY (id) );"`
-
-    When I try `wp db search example.com no_key --all-tables`
+    And I try `wp db search example.com no_key --all-tables`
     Then STDOUT should be empty
     And STDERR should be:
       """

features/db-tables.feature

@@ -44,7 +44,7 @@ Feature: List database tables
     # See https://core.trac.wordpress.org/ticket/19755
 
     # Leave out wp_blogmeta for old WP compat.
-    And STDOUT should contain:
+    Then STDOUT should contain:
       """
       wp_blogs
       wp_commentmeta