Changeset 40341

Timestamp:

03/27/2017 09:04:06 PM (8 years ago)

Author:

jeremyfelt

Message:

Tests: Consolidate logic used to skip API fixture generation.

This checks for is_multisite() and the minimum PHP version in the same block and removes two echo statements previously used to indicate generation had been skipped.

Fixes #40041.

File:

• trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php (modified) (1 diff)

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -294 +294 @@
         }
 
-        if ( is_multisite() ) {
-            echo "Skipping generation of API client fixtures in multisite mode.\n";
-        } else if ( version_compare( PHP_VERSION, '5.4', '<' ) ) {
-            echo "Skipping generation of API client fixtures due to unsupported JSON_* constants.\n";
-        } else {
+        // Only generate API client fixtures in single site and when required JSON_* constants are supported.
+        if ( ! is_multisite() && version_compare( PHP_VERSION, '5.4', '>=' ) ) {
             // Save the route object for QUnit tests.
             $file = './tests/qunit/fixtures/wp-api-generated.js';