Changeset 50604 for branches/5.4/tests/phpunit/tests/oembed/template.php

Timestamp:

03/26/2021 06:20:24 PM (5 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport GitHub Action and build improvements to the 5.4 branch.

This backports several build and test tool improvements to the 5.4 branch. Most notably, this includes:

• The changes required to allow each workflow to be triggered by the workflow_dispatch event so that tests can be run on a schedule [50590].
• The ability to run PHPUnit tests from src instead of build [50441-50443].
• Splitting single site and multisite tests into parallel jobs [50379].
• Split slow tests into separate, parallel jobs for PHP 5.6 [50444].
• Better branch and path scoping for GitHub Action workflows when running on pull_request [50432,50479].
• Several devDependency updates.

Merges [50267,50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598] to the 5.4 branch.
See #50401, #51734, #51801, #51802, #52548, #52608, #52612, #52623, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/oembed/template.php (modified) (3 diffs)

branches/5.4/tests/phpunit/tests/oembed/template.php

@@ -23 +23 @@
 
                 $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
+
+                // `print_embed_scripts()` assumes `wp-includes/js/wp-embed-template.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-embed-template.js' );
 
                 ob_start();
@@ -291 +294 @@
 
         /**
+         * Confirms that no ampersands exist in src/wp-includes/js/wp-embed.js.
+         *
+         * See also the `verify:wp-embed` Grunt task for verifying the built file.
+         *
          * @ticket 34698
          */
@@ -296 +303 @@
                 $this->assertNotContains( '&', file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' ) );
         }
-
-        /**
-         * @ticket 34698
-         *
-         * @depends test_js_no_ampersands
-         *
-         * The previous test confirms that no ampersands exist in src/wp-includes/js/wp-embed.js.
-         * However, we must also confirm that UglifyJS does not add ampersands during its
-         * optimizations (which we tweak to avoid, but indirectly -- understandably, there's
-         * no "don't add ampersands to my JavaScript file" option).
-         *
-         * So this test checks for ampersands in build/wp-includes/js/wp-embed.min.js.
-         * In many cases, this file will not exist; in those cases, we simply skip the test.
-         *
-         * So when would it be run? We have Travis CI run `npm run test` which then runs, in order,
-         * `qunit:compiled` (which runs the build) and then `phpunit`. Thus, this test will at least be
-         * run during continuous integration.
-         *
-         * However, we need to verify that `qunit:compiled` runs before `phpunit`. So this test also
-         * does a cheap check for a registered Grunt task called `test` that contains both
-         * `qunit:compiled` and `phpunit`, in that order.
-         *
-         * One final failsafe: The Gruntfile.js assertion takes place before checking for the existence
-         * of wp-embed.min.js. If the Grunt tasks are significantly refactored later, it could indicate
-         * that wp-embed.min.js doesn't exist anymore. We wouldn't want the test to silently become one
-         * that is always skipped, and thus useless.
-         */
-        function test_js_no_ampersands_in_compiled() {
-                $gruntfile = file_get_contents( dirname( ABSPATH ) . '/Gruntfile.js' );
-
-                // Confirm this file *should* exist, otherwise this test will always be skipped.
-                $test = '/grunt.registerTask\(\s*\'test\',.*\'qunit:compiled\'.*\'phpunit\'/';
-                $this->assertTrue( (bool) preg_match( $test, $gruntfile ) );
-
-                $file = dirname( ABSPATH ) . '/build/' . WPINC . '/js/wp-embed.min.js';
-                if ( ! file_exists( $file ) ) {
-                        return;
-                }
-                $this->assertNotContains( '&', file_get_contents( $file ) );
-        }
-
 }