Merge pull request #311 from wp-cli/fix/broken-theme-tests

Ensure bundled themes don't interfere with update tests

Author: schlessera

features/theme.feature

@@ -85,6 +85,13 @@ Feature: Manage WordPress themes
     When I run `wp theme activate p2`
     Then STDOUT should not be empty
 
+    # Ensure no other themes interfere with update.
+    When I run `wp theme list --status=inactive --field=name | xargs wp theme delete`
+    Then STDOUT should contain:
+      """
+      Success: Deleted
+      """
+
     When I run `wp theme install p2 --version=1.4.1 --force`
     Then STDOUT should not be empty
 
@@ -120,19 +127,29 @@ Feature: Manage WordPress themes
 
     When I run `wp theme install p2 --version=1.4.1 --force`
     Then STDOUT should contain:
-      """"
+      """
       Downloading install
-      """"
+      """
     And STDOUT should contain:
-      """"
+      """
       package from https://downloads.wordpress.org/theme/p2.1.4.1.zip...
-      """"
+      """
+
+    When I run `wp theme activate p2`
+    Then STDOUT should not be empty
+
+    # Ensure no other themes interfere with update.
+    When I run `wp theme list --status=inactive --field=name | xargs wp theme delete`
+    Then STDOUT should contain:
+      """
+      Success: Deleted
+      """
 
     When I run `wp theme status p2`
     Then STDOUT should contain:
-      """"
+      """
       Update available
-      """"
+      """
 
     When I run `wp theme update --all --exclude=p2 | grep 'Skipped'`
     Then STDOUT should contain:
@@ -142,9 +159,9 @@ Feature: Manage WordPress themes
 
     When I run `wp theme status p2`
     Then STDOUT should contain:
-      """"
+      """
       Update available
-      """"
+      """
 
   Scenario: Get the path of an installed theme
     Given a WP install

features/upgradables.feature

@@ -90,8 +90,12 @@ Feature: Manage WordPress themes and plugins
       """
     And the {SUITE_CACHE_DIR}/<type>/<item>-{NEW_VERSION}.zip file should exist
 
-    When I run `wp <type> update --all`
-    Then STDOUT should not be empty
+    # This can throw warnings about versions being higher than expected.
+    When I try `wp <type> update --all 2>&1`
+    Then STDOUT should contain:
+      """
+      updated
+      """
 
     When I run `wp <type> status <item>`
     Then STDOUT should not contain: