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

Fix Gherkin lint issues

Author: swissspidy

features/widget-reset.feature

@@ -105,12 +105,12 @@ Feature: Reset WordPress sidebars
       """
       0
       """
-    And I run `wp widget list sidebar-2 --format=count`
+    When I run `wp widget list sidebar-2 --format=count`
     Then STDOUT should be:
       """
       0
       """
-    And I run `wp widget list sidebar-3 --format=count`
+    When I run `wp widget list sidebar-3 --format=count`
     Then STDOUT should be:
       """
       0
@@ -120,19 +120,20 @@ Feature: Reset WordPress sidebars
       """
       calendar-1
       """
-    Then STDOUT should contain:
+    And STDOUT should contain:
       """
       search-1
       """
-    Then STDOUT should contain:
+    And STDOUT should contain:
       """
       text-1
       """
 
   Scenario: Testing movement of widgets while reset
     When I run `wp widget add calendar sidebar-2 --title="Calendar"`
     Then STDOUT should not be empty
-    And I run `wp widget add search sidebar-2 --title="Quick Search"`
+
+    When I run `wp widget add search sidebar-2 --title="Quick Search"`
     Then STDOUT should not be empty
 
     When I run `wp widget list sidebar-2 --format=ids`
@@ -146,8 +147,9 @@ Feature: Reset WordPress sidebars
     When I run `wp widget reset sidebar-2`
     And I run `wp widget list sidebar-2 --format=ids`
     Then STDOUT should be empty
-    And I run `wp widget list wp_inactive_widgets --format=ids`
-    Then STDOUT should contain:
+
+    When I run `wp widget list wp_inactive_widgets --format=ids`
+    And STDOUT should contain:
       """
       calendar-1 search-1
       """

features/widget.feature

@@ -14,7 +14,6 @@ Feature: Manage widgets in WordPress sidebar
     And I run `wp widget add search sidebar-2 --title="Quick Search"`
     And I run `wp widget add text sidebar-3 --title="Text"`
 
-
   Scenario: Widget CRUD
     When I run `wp widget list sidebar-1 --fields=name,id,position`
     Then STDOUT should be a table containing rows: