More fixes

Author: swissspidy

features/plugin-activate.feature

@@ -54,6 +54,9 @@ Feature: Activate WordPress plugins
     Then STDOUT should contain:
       """
       Plugin 'akismet' activated.
+      """
+    And STDOUT should not contain:
+      """
       Plugin 'sample-plugin' activated.
       """
     And STDOUT should not contain:

features/plugin-deactivate.feature

@@ -80,10 +80,13 @@ Feature: Deactivate WordPress plugins
 
   Scenario: Adding --exclude with plugin deactivate --all should exclude the plugins specified via --exclude
     When I try `wp plugin deactivate --all --exclude=sample-plugin`
-    Then STDOUT should be:
+    Then STDOUT should contain:
       """
       Plugin 'akismet' deactivated.
-      Success: Deactivated 1 of 1 plugins.
+      """
+    And STDOUT should contain:
+      """
+      Success: Deactivated 1 of 2 plugins.
       """
     And the return code should be 0
 

features/plugin-delete.feature

@@ -15,11 +15,17 @@ Feature: Delete WordPress plugins
 
   Scenario: Delete all installed plugins
     When I run `wp plugin delete --all`
-    Then STDOUT should be:
+    Then STDOUT should contain:
       """
       Deleted 'akismet' plugin.
+      """
+    And STDOUT should contain:
+      """
       Deleted 'sample-plugin' plugin.
-      Success: Deleted 2 of 2 plugins.
+      """
+    And STDOUT should contain:
+      """
+      Success: Deleted 3 of 3 plugins.
       """
     And the return code should be 0
 
@@ -42,7 +48,7 @@ Feature: Delete WordPress plugins
     And the return code should be 0
 
   Scenario: Excluding a plugin from deletion when using --all switch
-    When I try `wp plugin delete --all --exclude=akismet,sample-plugin`
+    When I try `wp plugin delete --all --exclude=akismet,sample-plugin,hello,hello-dolly`
     Then STDOUT should be:
       """
       Success: No plugins deleted.

features/plugin-uninstall.feature

@@ -85,11 +85,17 @@ Feature: Uninstall a WordPress plugin
 
   Scenario: Uninstall all installed plugins
     When I run `wp plugin uninstall --all`
-    Then STDOUT should be:
+    Then STDOUT should contain:
       """
       Uninstalled and deleted 'akismet' plugin.
+      """
+    And STDOUT should contain:
+      """
       Uninstalled and deleted 'sample-plugin' plugin.
-      Success: Uninstalled 2 of 2 plugins.
+      """
+    And STDOUT should contain:
+      """
+      Success: Uninstalled 3 of 3 plugins.
       """
     And the return code should be 0
     And STDERR should be empty
@@ -105,14 +111,20 @@ Feature: Uninstall a WordPress plugin
     When I run `wp plugin activate --all`
     Then STDOUT should contain:
       """
-      Success: Activated 2 of 2 plugins.
+      Success: Activated 3 of 3 plugins.
       """
 
     When I try `wp plugin uninstall --all`
-    Then STDERR should be:
+    Then STDERR should contain:
       """
       Warning: The 'akismet' plugin is active.
+      """
+    And STDERR should contain:
+      """
       Warning: The 'sample-plugin' plugin is active.
+      """
+    And STDERR should contain:
+      """
       Error: No plugins uninstalled.
       """
     And the return code should be 1
@@ -126,7 +138,7 @@ Feature: Uninstall a WordPress plugin
     And STDERR should be empty
 
   Scenario: Excluding a plugin from uninstallation when using --all switch
-    When I try `wp plugin uninstall --all --exclude=akismet,sample-plugin`
+    When I try `wp plugin uninstall --all --exclude=akismet,sample-plugin,hello,hello-dolly`
     Then STDOUT should be:
       """
       Success: No plugins uninstalled.

features/plugin.feature

@@ -301,7 +301,7 @@ Feature: Manage WordPress plugins
   Scenario: List plugins
     Given a WP install
 
-    When I run `wp plugin activate akismet`
+    When I run `wp plugin activate --all`
     Then STDOUT should not be empty
 
     When I run `wp plugin list --status=inactive --field=name`
@@ -431,9 +431,12 @@ Feature: Manage WordPress plugins
     Then STDOUT should contain:
       """
       Plugin 'akismet' activated.
+      """
+    And STDOUT should contain:
+      """
       Plugin 'sample-plugin' activated.
       """
-    And STDOUT should not contain:
+    And STDOUT should contain:
       """
       Success: Activated 3 of 3 plugins.
       """