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

Fix test issues

Author: schlessera

composer.json

@@ -18,12 +18,12 @@
     ],
     "require": {
         "composer/semver": "^1.4 || ^2 || ^3",
-        "wp-cli/wp-cli": "^2.5"
+        "wp-cli/wp-cli": "^2.5.1"
     },
     "require-dev": {
         "wp-cli/entity-command": "^1.3 || ^2",
         "wp-cli/scaffold-command": "^1.2 || ^2",
-        "wp-cli/wp-cli-tests": "^3.0.11"
+        "wp-cli/wp-cli-tests": "^3.0.16"
     },
     "config": {
         "process-timeout": 7200,

features/plugin-update.feature

@@ -50,19 +50,19 @@ Feature: Update WordPress plugins
 
     When I run `wp plugin install wordpress-importer --version=0.5 --force`
     Then STDOUT should contain:
-      """"
+      """
       Downloading install
-      """"
+      """
     And STDOUT should contain:
-      """"
+      """
       package from https://downloads.wordpress.org/plugin/wordpress-importer.0.5.zip...
-      """"
+      """
 
     When I run `wp plugin status wordpress-importer`
     Then STDOUT should contain:
-      """"
+      """
       Update available
-      """"
+      """
 
     When I run `wp plugin update --all --exclude=wordpress-importer | grep 'Skipped'`
     Then STDOUT should contain:
@@ -72,9 +72,9 @@ Feature: Update WordPress plugins
 
     When I run `wp plugin status wordpress-importer`
     Then STDOUT should contain:
-      """"
+      """
       Update available
-      """"
+      """
 
   Scenario: Update a plugin to its latest patch release
     Given a WP install
@@ -196,15 +196,25 @@ Feature: Update WordPress plugins
   Scenario: Plugin updates that error should not report a success
     Given a WP install
     And I run `wp plugin install --force akismet --version=4.0`
-    And I run `chmod -w wp-content/plugins/akismet`
+
+    When I run `chmod -w wp-content/plugins/akismet`
     And I try `wp plugin update akismet`
-    And save STDERR as {ERROR}
-    And I run `chmod +w wp-content/plugins/akismet`
+    Then STDERR should contain:
+      """
+      Error:
+      """
+    Then STDOUT should not contain:
+      """
+      Success:
+      """
 
-    And I run `echo "{ERROR}"`
+    When I run `chmod +w wp-content/plugins/akismet`
+    And I try `wp plugin update akismet`
+    Then STDERR should not contain:
+      """
+      Error:
+      """
     Then STDOUT should contain:
       """
-      Error: 
+      Success:
       """
-
-    

features/plugin.feature

@@ -171,7 +171,7 @@ Feature: Manage WordPress plugins
       """
       Warning: The 'xxx' plugin could not be found.
       """
-    Then STDERR should contain:
+    And STDERR should contain:
       """
       Warning: The 'yyy' plugin could not be found.
       """

src/WP_CLI/CommandWithUpgrade.php

@@ -320,7 +320,7 @@ protected function update_many( $args, $assoc_args ) {
 		call_user_func( $this->upgrade_refresh );
 
 		if ( ! empty( $assoc_args['format'] ) && in_array( $assoc_args['format'], [ 'json', 'csv' ], true ) ) {
-			$logger = new Loggers\Quiet();
+			$logger = new Loggers\Quiet( WP_CLI::get_runner()->in_color() );
 			WP_CLI::set_logger( $logger );
 		}