From 9104cc2134b459d29ed3597c42cc16b63486295a Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 16 Jan 2024 11:13:21 +0100
Subject: [PATCH] Rename tests

---
 .../tests/script-modules/wpScriptModules.php  | 500 +++++++++---------
 1 file changed, 248 insertions(+), 252 deletions(-)

diff --git a/tests/phpunit/tests/script-modules/wpScriptModules.php b/tests/phpunit/tests/script-modules/wpScriptModules.php
index 2c82b592caacf..89821e8f0b41a 100644
--- a/tests/phpunit/tests/script-modules/wpScriptModules.php
+++ b/tests/phpunit/tests/script-modules/wpScriptModules.php
@@ -17,169 +17,163 @@ class Tests_WP_Script_Modules extends WP_UnitTestCase {
 	 *
 	 * @var WP_Script_Modules
 	 */
-	protected $modules;
+	protected $script_modules;
 
 	/**
 	 * Set up.
 	 */
 	public function set_up() {
 		parent::set_up();
-		$this->modules = new WP_Script_Modules();
+		$this->script_modules = new WP_Script_Modules();
 	}
 
 	/**
-	 * Gets a list of the enqueued modules.
+	 * Gets a list of the enqueued script modules.
 	 *
-	 * @return array Enqueued module URLs, keyed by module identifier.
+	 * @return array Enqueued script module URLs, keyed by script module identifier.
 	 */
-	public function get_enqueued_modules() {
-		$modules_markup   = get_echo( array( $this->modules, 'print_enqueued_modules' ) );
-		$p                = new WP_HTML_Tag_Processor( $modules_markup );
-		$enqueued_modules = array();
-
-		while ( $p->next_tag(
-			array(
-				'tag'    => 'SCRIPT',
-				'import' => 'module',
-			)
-		) ) {
-			$id                      = preg_replace( '/-js-module$/', '', $p->get_attribute( 'id' ) );
-			$enqueued_modules[ $id ] = $p->get_attribute( 'src' );
+	public function get_enqueued_script_modules() {
+		$script_modules_markup   = get_echo( array( $this->script_modules, 'print_enqueued_script_modules' ) );
+		$p                       = new WP_HTML_Tag_Processor( $script_modules_markup );
+		$enqueued_script_modules = array();
+
+		while ( $p->next_tag( array( 'tag' => 'SCRIPT' ) ) ) {
+			if ( 'module' === $p->get_attribute( 'type' ) ) {
+				$id                             = preg_replace( '/-js-module$/', '', $p->get_attribute( 'id' ) );
+				$enqueued_script_modules[ $id ] = $p->get_attribute( 'src' );
+			}
 		}
 
-		return $enqueued_modules;
+		return $enqueued_script_modules;
 	}
 
 	/**
-	 * Gets the modules listed in the import map.
+	 * Gets the script modules listed in the import map.
 	 *
-	 * @return array Import map entry URLs, keyed by module identifier.
+	 * @return array Import map entry URLs, keyed by script module identifier.
 	 */
 	public function get_import_map() {
-		$import_map_markup = get_echo( array( $this->modules, 'print_import_map' ) );
+		$import_map_markup = get_echo( array( $this->script_modules, 'print_import_map' ) );
 		preg_match( '/<script type="importmap" id="wp-importmap">.*?(\{.*\}).*?<\/script>/s', $import_map_markup, $import_map_string );
 		return json_decode( $import_map_string[1], true )['imports'];
 	}
 
 	/**
-	 * Gets a list of preloaded modules.
+	 * Gets a list of preloaded script modules.
 	 *
-	 * @return array Preloaded module URLs, keyed by module identifier.
+	 * @return array Preloaded script module URLs, keyed by script module identifier.
 	 */
-	public function get_preloaded_modules() {
-		$preloaded_markup  = get_echo( array( $this->modules, 'print_module_preloads' ) );
-		$p                 = new WP_HTML_Tag_Processor( $preloaded_markup );
-		$preloaded_modules = array();
-
-		while ( $p->next_tag(
-			array(
-				'tag' => 'LINK',
-				'rel' => 'modulepreload',
-			)
-		) ) {
-			$id                       = preg_replace( '/-js-modulepreload$/', '', $p->get_attribute( 'id' ) );
-			$preloaded_modules[ $id ] = $p->get_attribute( 'href' );
+	public function get_preloaded_script_modules() {
+		$preloaded_markup         = get_echo( array( $this->script_modules, 'print_script_module_preloads' ) );
+		$p                        = new WP_HTML_Tag_Processor( $preloaded_markup );
+		$preloaded_script_modules = array();
+
+		while ( $p->next_tag( array( 'tag' => 'LINK' ) ) ) {
+			if ( 'modulepreload' === $p->get_attribute( 'rel' ) ) {
+				$id                              = preg_replace( '/-js-modulepreload$/', '', $p->get_attribute( 'id' ) );
+				$preloaded_script_modules[ $id ] = $p->get_attribute( 'href' );
+			}
 		}
 
-		return $preloaded_modules;
+		return $preloaded_script_modules;
 	}
 
 	/**
-	 * Tests that a module gets enqueued correctly after being registered.
+	 * Tests that a script module gets enqueued correctly after being registered.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_wp_enqueue_module() {
-		$this->modules->register( 'foo', '/foo.js' );
-		$this->modules->register( 'bar', '/bar.js' );
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'bar' );
+	public function test_wp_enqueue_script_module() {
+		$this->script_modules->register( 'foo', '/foo.js' );
+		$this->script_modules->register( 'bar', '/bar.js' );
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'bar' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 2, $enqueued_modules );
-		$this->assertStringStartsWith( '/foo.js', $enqueued_modules['foo'] );
-		$this->assertStringStartsWith( '/bar.js', $enqueued_modules['bar'] );
+		$this->assertCount( 2, $enqueued_script_modules );
+		$this->assertStringStartsWith( '/foo.js', $enqueued_script_modules['foo'] );
+		$this->assertStringStartsWith( '/bar.js', $enqueued_script_modules['bar'] );
 	}
 
 	/**
-	* Tests that a module can be dequeued after being enqueued.
+	* Tests that a script module can be dequeued after being enqueued.
 	*
 	* @ticket 56313
 	*
 	* @covers ::register()
 	* @covers ::enqueue()
 	* @covers ::dequeue()
-	* @covers ::print_enqueued_modules()
+	* @covers ::print_enqueued_script_modules()
 	*/
-	public function test_wp_dequeue_module() {
-		$this->modules->register( 'foo', '/foo.js' );
-		$this->modules->register( 'bar', '/bar.js' );
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'bar' );
-		$this->modules->dequeue( 'foo' ); // Dequeued.
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertFalse( isset( $enqueued_modules['foo'] ) );
-		$this->assertTrue( isset( $enqueued_modules['bar'] ) );
+	public function test_wp_dequeue_script_module() {
+		$this->script_modules->register( 'foo', '/foo.js' );
+		$this->script_modules->register( 'bar', '/bar.js' );
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'bar' );
+		$this->script_modules->dequeue( 'foo' ); // Dequeued.
+
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertFalse( isset( $enqueued_script_modules['foo'] ) );
+		$this->assertTrue( isset( $enqueued_script_modules['bar'] ) );
 	}
 
 	/**
-	* Tests that a module can be enqueued before it is registered, and will be
-	* handled correctly once registered.
+	* Tests that a script module can be enqueued before it is registered, and will
+	* be handled correctly once registered.
 	*
 	* @ticket 56313
 	*
 	* @covers ::register()
 	* @covers ::enqueue()
-	* @covers ::print_enqueued_modules()
+	* @covers ::print_enqueued_script_modules()
 	*/
-	public function test_wp_enqueue_module_works_before_register() {
-		$this->modules->enqueue( 'foo' );
-		$this->modules->register( 'foo', '/foo.js' );
-		$this->modules->enqueue( 'bar' ); // Not registered.
+	public function test_wp_enqueue_script_module_works_before_register() {
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->register( 'foo', '/foo.js' );
+		$this->script_modules->enqueue( 'bar' ); // Not registered.
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertStringStartsWith( '/foo.js', $enqueued_modules['foo'] );
-		$this->assertFalse( isset( $enqueued_modules['bar'] ) );
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertStringStartsWith( '/foo.js', $enqueued_script_modules['foo'] );
+		$this->assertFalse( isset( $enqueued_script_modules['bar'] ) );
 	}
 
 	/**
-	 * Tests that a module can be dequeued before it is registered and ensures
-	 * that it is not enqueued after registration.
+	 * Tests that a script module can be dequeued before it is registered and
+	 * ensures that it is not enqueued after registration.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
 	 * @covers ::dequeue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_wp_dequeue_module_works_before_register() {
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'bar' );
-		$this->modules->dequeue( 'foo' );
-		$this->modules->register( 'foo', '/foo.js' );
-		$this->modules->register( 'bar', '/bar.js' );
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertFalse( isset( $enqueued_modules['foo'] ) );
-		$this->assertTrue( isset( $enqueued_modules['bar'] ) );
+	public function test_wp_dequeue_script_module_works_before_register() {
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'bar' );
+		$this->script_modules->dequeue( 'foo' );
+		$this->script_modules->register( 'foo', '/foo.js' );
+		$this->script_modules->register( 'bar', '/bar.js' );
+
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertFalse( isset( $enqueued_script_modules['foo'] ) );
+		$this->assertTrue( isset( $enqueued_script_modules['bar'] ) );
 	}
 
 	/**
 	 * Tests that dependencies for a registered module are added to the import map
-	 * when the module is enqueued.
+	 * when the script module is enqueued.
 	 *
 	 * @ticket 56313
 	 *
@@ -188,10 +182,10 @@ public function test_wp_dequeue_module_works_before_register() {
 	 * @covers ::print_import_map()
 	 */
 	public function test_wp_import_map_dependencies() {
-		$this->modules->register( 'foo', '/foo.js', array( 'dep' ) );
-		$this->modules->register( 'dep', '/dep.js' );
-		$this->modules->register( 'no-dep', '/no-dep.js' );
-		$this->modules->enqueue( 'foo' );
+		$this->script_modules->register( 'foo', '/foo.js', array( 'dep' ) );
+		$this->script_modules->register( 'dep', '/dep.js' );
+		$this->script_modules->register( 'no-dep', '/no-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
 
 		$import_map = $this->get_import_map();
 
@@ -202,7 +196,7 @@ public function test_wp_import_map_dependencies() {
 
 	/**
 	 * Tests that dependencies are not duplicated in the import map when multiple
-	 * modules require the same dependency.
+	 * script modules require the same dependency.
 	 *
 	 * @ticket 56313
 	 *
@@ -211,11 +205,11 @@ public function test_wp_import_map_dependencies() {
 	 * @covers ::print_import_map()
 	 */
 	public function test_wp_import_map_no_duplicate_dependencies() {
-		$this->modules->register( 'foo', '/foo.js', array( 'dep' ) );
-		$this->modules->register( 'bar', '/bar.js', array( 'dep' ) );
-		$this->modules->register( 'dep', '/dep.js' );
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'bar' );
+		$this->script_modules->register( 'foo', '/foo.js', array( 'dep' ) );
+		$this->script_modules->register( 'bar', '/bar.js', array( 'dep' ) );
+		$this->script_modules->register( 'dep', '/dep.js' );
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'bar' );
 
 		$import_map = $this->get_import_map();
 
@@ -234,7 +228,7 @@ public function test_wp_import_map_no_duplicate_dependencies() {
 	 * @covers ::print_import_map()
 	 */
 	public function test_wp_import_map_recursive_dependencies() {
-		$this->modules->register(
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -245,7 +239,7 @@ public function test_wp_import_map_recursive_dependencies() {
 				),
 			)
 		);
-		$this->modules->register(
+		$this->script_modules->register(
 			'static-dep',
 			'/static-dep.js',
 			array(
@@ -259,11 +253,11 @@ public function test_wp_import_map_recursive_dependencies() {
 				),
 			)
 		);
-		$this->modules->register( 'dynamic-dep', '/dynamic-dep.js' );
-		$this->modules->register( 'nested-static-dep', '/nested-static-dep.js' );
-		$this->modules->register( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
-		$this->modules->register( 'no-dep', '/no-dep.js' );
-		$this->modules->enqueue( 'foo' );
+		$this->script_modules->register( 'dynamic-dep', '/dynamic-dep.js' );
+		$this->script_modules->register( 'nested-static-dep', '/nested-static-dep.js' );
+		$this->script_modules->register( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
+		$this->script_modules->register( 'no-dep', '/no-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
 
 		$import_map = $this->get_import_map();
 
@@ -285,10 +279,10 @@ public function test_wp_import_map_recursive_dependencies() {
 	 * @covers ::print_import_map()
 	 */
 	public function test_wp_import_map_doesnt_print_if_no_dependencies() {
-		$this->modules->register( 'foo', '/foo.js' ); // No deps.
-		$this->modules->enqueue( 'foo' );
+		$this->script_modules->register( 'foo', '/foo.js' ); // No deps.
+		$this->script_modules->enqueue( 'foo' );
 
-		$import_map_markup = get_echo( array( $this->modules, 'print_import_map' ) );
+		$import_map_markup = get_echo( array( $this->script_modules, 'print_import_map' ) );
 
 		$this->assertEmpty( $import_map_markup );
 	}
@@ -301,10 +295,10 @@ public function test_wp_import_map_doesnt_print_if_no_dependencies() {
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_module_preloads()
+	 * @covers ::print_script_module_preloads()
 	 */
 	public function test_wp_enqueue_preloaded_static_dependencies() {
-		$this->modules->register(
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -315,7 +309,7 @@ public function test_wp_enqueue_preloaded_static_dependencies() {
 				),
 			)
 		);
-		$this->modules->register(
+		$this->script_modules->register(
 			'static-dep',
 			'/static-dep.js',
 			array(
@@ -329,20 +323,20 @@ public function test_wp_enqueue_preloaded_static_dependencies() {
 				),
 			)
 		);
-		$this->modules->register( 'dynamic-dep', '/dynamic-dep.js' );
-		$this->modules->register( 'nested-static-dep', '/nested-static-dep.js' );
-		$this->modules->register( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
-		$this->modules->register( 'no-dep', '/no-dep.js' );
-		$this->modules->enqueue( 'foo' );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-
-		$this->assertCount( 2, $preloaded_modules );
-		$this->assertStringStartsWith( '/static-dep.js', $preloaded_modules['static-dep'] );
-		$this->assertStringStartsWith( '/nested-static-dep.js', $preloaded_modules['nested-static-dep'] );
-		$this->assertFalse( isset( $preloaded_modules['no-dep'] ) );
-		$this->assertFalse( isset( $preloaded_modules['dynamic-dep'] ) );
-		$this->assertFalse( isset( $preloaded_modules['nested-dynamic-dep'] ) );
+		$this->script_modules->register( 'dynamic-dep', '/dynamic-dep.js' );
+		$this->script_modules->register( 'nested-static-dep', '/nested-static-dep.js' );
+		$this->script_modules->register( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
+		$this->script_modules->register( 'no-dep', '/no-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
+
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+
+		$this->assertCount( 2, $preloaded_script_modules );
+		$this->assertStringStartsWith( '/static-dep.js', $preloaded_script_modules['static-dep'] );
+		$this->assertStringStartsWith( '/nested-static-dep.js', $preloaded_script_modules['nested-static-dep'] );
+		$this->assertFalse( isset( $preloaded_script_modules['no-dep'] ) );
+		$this->assertFalse( isset( $preloaded_script_modules['dynamic-dep'] ) );
+		$this->assertFalse( isset( $preloaded_script_modules['nested-dynamic-dep'] ) );
 	}
 
 	/**
@@ -352,10 +346,10 @@ public function test_wp_enqueue_preloaded_static_dependencies() {
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_module_preloads()
+	 * @covers ::print_script_module_preloads()
 	 */
 	public function test_wp_dont_preload_static_dependencies_of_dynamic_dependencies() {
-		$this->modules->register(
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -366,32 +360,32 @@ public function test_wp_dont_preload_static_dependencies_of_dynamic_dependencies
 				),
 			)
 		);
-		$this->modules->register( 'static-dep', '/static-dep.js' );
-		$this->modules->register( 'dynamic-dep', '/dynamic-dep.js', array( 'nested-static-dep' ) );
-		$this->modules->register( 'nested-static-dep', '/nested-static-dep.js' );
-		$this->modules->register( 'no-dep', '/no-dep.js' );
-		$this->modules->enqueue( 'foo' );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-
-		$this->assertCount( 1, $preloaded_modules );
-		$this->assertStringStartsWith( '/static-dep.js', $preloaded_modules['static-dep'] );
-		$this->assertFalse( isset( $preloaded_modules['dynamic-dep'] ) );
-		$this->assertFalse( isset( $preloaded_modules['nested-static-dep'] ) );
-		$this->assertFalse( isset( $preloaded_modules['no-dep'] ) );
+		$this->script_modules->register( 'static-dep', '/static-dep.js' );
+		$this->script_modules->register( 'dynamic-dep', '/dynamic-dep.js', array( 'nested-static-dep' ) );
+		$this->script_modules->register( 'nested-static-dep', '/nested-static-dep.js' );
+		$this->script_modules->register( 'no-dep', '/no-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
+
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+
+		$this->assertCount( 1, $preloaded_script_modules );
+		$this->assertStringStartsWith( '/static-dep.js', $preloaded_script_modules['static-dep'] );
+		$this->assertFalse( isset( $preloaded_script_modules['dynamic-dep'] ) );
+		$this->assertFalse( isset( $preloaded_script_modules['nested-static-dep'] ) );
+		$this->assertFalse( isset( $preloaded_script_modules['no-dep'] ) );
 	}
 
 	/**
-	 * Tests that preloaded dependencies don't include enqueued modules.
+	 * Tests that preloaded dependencies don't include enqueued script modules.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_module_preloads()
+	 * @covers ::print_script_module_preloads()
 	 */
-	public function test_wp_preloaded_dependencies_filter_enqueued_modules() {
-		$this->modules->register(
+	public function test_wp_preloaded_dependencies_filter_enqueued_script_modules() {
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -399,21 +393,21 @@ public function test_wp_preloaded_dependencies_filter_enqueued_modules() {
 				'enqueued-dep',
 			)
 		);
-		$this->modules->register( 'dep', '/dep.js' );
-		$this->modules->register( 'enqueued-dep', '/enqueued-dep.js' );
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'enqueued-dep' ); // Not preloaded.
+		$this->script_modules->register( 'dep', '/dep.js' );
+		$this->script_modules->register( 'enqueued-dep', '/enqueued-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'enqueued-dep' ); // Not preloaded.
 
-		$preloaded_modules = $this->get_preloaded_modules();
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
 
-		$this->assertCount( 1, $preloaded_modules );
-		$this->assertTrue( isset( $preloaded_modules['dep'] ) );
-		$this->assertFalse( isset( $preloaded_modules['enqueued-dep'] ) );
+		$this->assertCount( 1, $preloaded_script_modules );
+		$this->assertTrue( isset( $preloaded_script_modules['dep'] ) );
+		$this->assertFalse( isset( $preloaded_script_modules['enqueued-dep'] ) );
 	}
 
 	/**
-	 * Tests that enqueued modules with dependants correctly add both the module
-	 * and its dependencies to the import map.
+	 * Tests that enqueued script modules with dependants correctly add both the
+	 * script module and its dependencies to the import map.
 	 *
 	 * @ticket 56313
 	 *
@@ -421,8 +415,8 @@ public function test_wp_preloaded_dependencies_filter_enqueued_modules() {
 	 * @covers ::enqueue()
 	 * @covers ::print_import_map()
 	 */
-	public function test_wp_enqueued_modules_with_dependants_add_import_map() {
-		$this->modules->register(
+	public function test_wp_enqueued_script_modules_with_dependants_add_import_map() {
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -430,10 +424,10 @@ public function test_wp_enqueued_modules_with_dependants_add_import_map() {
 				'enqueued-dep',
 			)
 		);
-		$this->modules->register( 'dep', '/dep.js' );
-		$this->modules->register( 'enqueued-dep', '/enqueued-dep.js' );
-		$this->modules->enqueue( 'foo' );
-		$this->modules->enqueue( 'enqueued-dep' ); // Also in the import map.
+		$this->script_modules->register( 'dep', '/dep.js' );
+		$this->script_modules->register( 'enqueued-dep', '/enqueued-dep.js' );
+		$this->script_modules->enqueue( 'foo' );
+		$this->script_modules->enqueue( 'enqueued-dep' ); // Also in the import map.
 
 		$import_map = $this->get_import_map();
 
@@ -451,7 +445,7 @@ public function test_wp_enqueued_modules_with_dependants_add_import_map() {
 	 * @covers ::get_versioned_src()
 	 */
 	public function test_get_versioned_src() {
-		$get_versioned_src = new ReflectionMethod( $this->modules, 'get_versioned_src' );
+		$get_versioned_src = new ReflectionMethod( $this->script_modules, 'get_versioned_src' );
 		$get_versioned_src->setAccessible( true );
 
 		$module_with_version = array(
@@ -459,7 +453,7 @@ public function test_get_versioned_src() {
 			'version' => '1.0',
 		);
 
-		$result = $get_versioned_src->invoke( $this->modules, $module_with_version );
+		$result = $get_versioned_src->invoke( $this->script_modules, $module_with_version );
 		$this->assertEquals( 'http://example.com/module.js?ver=1.0', $result );
 
 		$module_without_version = array(
@@ -467,7 +461,7 @@ public function test_get_versioned_src() {
 			'version' => null,
 		);
 
-		$result = $get_versioned_src->invoke( $this->modules, $module_without_version );
+		$result = $get_versioned_src->invoke( $this->script_modules, $module_without_version );
 		$this->assertEquals( 'http://example.com/module.js', $result );
 
 		$module_with_wp_version = array(
@@ -475,7 +469,7 @@ public function test_get_versioned_src() {
 			'version' => false,
 		);
 
-		$result = $get_versioned_src->invoke( $this->modules, $module_with_wp_version );
+		$result = $get_versioned_src->invoke( $this->script_modules, $module_with_wp_version );
 		$this->assertEquals( 'http://example.com/module.js?ver=' . get_bloginfo( 'version' ), $result );
 
 		$module_with_existing_query_string = array(
@@ -483,25 +477,25 @@ public function test_get_versioned_src() {
 			'version' => '1.0',
 		);
 
-		$result = $get_versioned_src->invoke( $this->modules, $module_with_existing_query_string );
+		$result = $get_versioned_src->invoke( $this->script_modules, $module_with_existing_query_string );
 		$this->assertEquals( 'http://example.com/module.js?foo=bar&ver=1.0', $result );
 	}
 
 	/**
 	 * Tests that the correct version is propagated to the import map, enqueued
-	 * modules and preloaded modules.
+	 * script modules and preloaded script modules.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 * @covers ::print_import_map()
-	 * @covers ::print_module_preloads()
+	 * @covers ::print_script_module_preloads()
 	 * @covers ::get_version_query_string()
 	 */
 	public function test_version_is_propagated_correctly() {
-		$this->modules->register(
+		$this->script_modules->register(
 			'foo',
 			'/foo.js',
 			array(
@@ -509,160 +503,162 @@ public function test_version_is_propagated_correctly() {
 			),
 			'1.0'
 		);
-		$this->modules->register( 'dep', '/dep.js', array(), '2.0' );
-		$this->modules->enqueue( 'foo' );
+		$this->script_modules->register( 'dep', '/dep.js', array(), '2.0' );
+		$this->script_modules->enqueue( 'foo' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
-		$this->assertEquals( '/foo.js?ver=1.0', $enqueued_modules['foo'] );
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+		$this->assertEquals( '/foo.js?ver=1.0', $enqueued_script_modules['foo'] );
 
 		$import_map = $this->get_import_map();
 		$this->assertEquals( '/dep.js?ver=2.0', $import_map['dep'] );
 
-		$preloaded_modules = $this->get_preloaded_modules();
-		$this->assertEquals( '/dep.js?ver=2.0', $preloaded_modules['dep'] );
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+		$this->assertEquals( '/dep.js?ver=2.0', $preloaded_script_modules['dep'] );
 	}
 
 	/**
-	 * Tests that it can print the enqueued modules multiple times, and it will
-	 * only print the modules that have not been printed before.
+	 * Tests that it can print the enqueued script modules multiple times, and it
+	 * will only print the script modules that have not been printed before.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_print_enqueued_modules_can_be_called_multiple_times() {
-		$this->modules->register( 'foo', '/foo.js' );
-		$this->modules->register( 'bar', '/bar.js' );
-		$this->modules->enqueue( 'foo' );
+	public function test_print_enqueued_script_modules_can_be_called_multiple_times() {
+		$this->script_modules->register( 'foo', '/foo.js' );
+		$this->script_modules->register( 'bar', '/bar.js' );
+		$this->script_modules->enqueue( 'foo' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertTrue( isset( $enqueued_modules['foo'] ) );
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertTrue( isset( $enqueued_script_modules['foo'] ) );
 
-		$this->modules->enqueue( 'bar' );
+		$this->script_modules->enqueue( 'bar' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertTrue( isset( $enqueued_modules['bar'] ) );
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertTrue( isset( $enqueued_script_modules['bar'] ) );
 
-		$enqueued_modules = $this->get_enqueued_modules();
-		$this->assertCount( 0, $enqueued_modules );
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+		$this->assertCount( 0, $enqueued_script_modules );
 	}
 
 	/**
-	 * Tests that it can print the preloaded modules multiple times, and it will
-	 * only print the modules that have not been printed before.
+	 * Tests that it can print the preloaded script modules multiple times, and it
+	 * will only print the script modules that have not been printed before.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_module_preloads()
+	 * @covers ::print_script_module_preloads()
 	 */
-	public function test_print_preloaded_modules_can_be_called_multiple_times() {
-		$this->modules->register( 'foo', '/foo.js', array( 'static-dep-1', 'static-dep-2' ) );
-		$this->modules->register( 'bar', '/bar.js', array( 'static-dep-3' ) );
-		$this->modules->register( 'static-dep-1', '/static-dep-1.js' );
-		$this->modules->register( 'static-dep-3', '/static-dep-3.js' );
-		$this->modules->enqueue( 'foo' );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-		$this->assertCount( 1, $preloaded_modules );
-		$this->assertTrue( isset( $preloaded_modules['static-dep-1'] ) );
-
-		$this->modules->register( 'static-dep-2', '/static-dep-2.js' );
-		$this->modules->enqueue( 'bar' );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-		$this->assertCount( 2, $preloaded_modules );
-		$this->assertTrue( isset( $preloaded_modules['static-dep-2'] ) );
-		$this->assertTrue( isset( $preloaded_modules['static-dep-3'] ) );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-		$this->assertCount( 0, $preloaded_modules );
+	public function test_print_preloaded_script_modules_can_be_called_multiple_times() {
+		$this->script_modules->register( 'foo', '/foo.js', array( 'static-dep-1', 'static-dep-2' ) );
+		$this->script_modules->register( 'bar', '/bar.js', array( 'static-dep-3' ) );
+		$this->script_modules->register( 'static-dep-1', '/static-dep-1.js' );
+		$this->script_modules->register( 'static-dep-3', '/static-dep-3.js' );
+		$this->script_modules->enqueue( 'foo' );
+
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+		$this->assertCount( 1, $preloaded_script_modules );
+		$this->assertTrue( isset( $preloaded_script_modules['static-dep-1'] ) );
+
+		$this->script_modules->register( 'static-dep-2', '/static-dep-2.js' );
+		$this->script_modules->enqueue( 'bar' );
+
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+		$this->assertCount( 2, $preloaded_script_modules );
+		$this->assertTrue( isset( $preloaded_script_modules['static-dep-2'] ) );
+		$this->assertTrue( isset( $preloaded_script_modules['static-dep-3'] ) );
+
+		$preloaded_script_modules = $this->get_preloaded_script_modules();
+		$this->assertCount( 0, $preloaded_script_modules );
 	}
 
 	/**
-	 * Tests that a module is not registered when calling enqueue without a valid
-	 * src.
+	 * Tests that a script module is not registered when calling enqueue without a
+	 * valid src.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_wp_enqueue_module_doesnt_register_without_a_valid_src() {
-		$this->modules->enqueue( 'foo' );
+	public function test_wp_enqueue_script_module_doesnt_register_without_a_valid_src() {
+		$this->script_modules->enqueue( 'foo' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 0, $enqueued_modules );
-		$this->assertFalse( isset( $enqueued_modules['foo'] ) );
+		$this->assertCount( 0, $enqueued_script_modules );
+		$this->assertFalse( isset( $enqueued_script_modules['foo'] ) );
 	}
 
 	/**
-	 * Tests that a module is registered when calling enqueue with a valid src.
+	 * Tests that a script module is registered when calling enqueue with a valid
+	 * src.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_wp_enqueue_module_registers_with_valid_src() {
-		$this->modules->enqueue( 'foo', '/foo.js' );
+	public function test_wp_enqueue_script_module_registers_with_valid_src() {
+		$this->script_modules->enqueue( 'foo', '/foo.js' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertStringStartsWith( '/foo.js', $enqueued_modules['foo'] );
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertStringStartsWith( '/foo.js', $enqueued_script_modules['foo'] );
 	}
 
 	/**
-	 * Tests that a module is registered when calling enqueue with a valid src the
-	 * second time.
+	 * Tests that a script module is registered when calling enqueue with a valid
+	 * src the second time.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 */
-	public function test_wp_enqueue_module_registers_with_valid_src_the_second_time() {
-		$this->modules->enqueue( 'foo' ); // Not valid src.
+	public function test_wp_enqueue_script_module_registers_with_valid_src_the_second_time() {
+		$this->script_modules->enqueue( 'foo' ); // Not valid src.
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 0, $enqueued_modules );
-		$this->assertFalse( isset( $enqueued_modules['foo'] ) );
+		$this->assertCount( 0, $enqueued_script_modules );
+		$this->assertFalse( isset( $enqueued_script_modules['foo'] ) );
 
-		$this->modules->enqueue( 'foo', '/foo.js' ); // Valid src.
+		$this->script_modules->enqueue( 'foo', '/foo.js' ); // Valid src.
 
-		$enqueued_modules = $this->get_enqueued_modules();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
 
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertStringStartsWith( '/foo.js', $enqueued_modules['foo'] );
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertStringStartsWith( '/foo.js', $enqueued_script_modules['foo'] );
 	}
 
 	/**
-	 * Tests that a module is registered with all the params when calling enqueue.
+	 * Tests that a script module is registered with all the params when calling
+	 * enqueue.
 	 *
 	 * @ticket 56313
 	 *
 	 * @covers ::register()
 	 * @covers ::enqueue()
-	 * @covers ::print_enqueued_modules()
+	 * @covers ::print_enqueued_script_modules()
 	 * @covers ::print_import_map()
 	 */
-	public function test_wp_enqueue_module_registers_all_params() {
-		$this->modules->enqueue( 'foo', '/foo.js', array( 'dep' ), '1.0' );
-		$this->modules->register( 'dep', '/dep.js' );
+	public function test_wp_enqueue_script_module_registers_all_params() {
+		$this->script_modules->enqueue( 'foo', '/foo.js', array( 'dep' ), '1.0' );
+		$this->script_modules->register( 'dep', '/dep.js' );
 
-		$enqueued_modules = $this->get_enqueued_modules();
-		$import_map       = $this->get_import_map();
+		$enqueued_script_modules = $this->get_enqueued_script_modules();
+		$import_map              = $this->get_import_map();
 
-		$this->assertCount( 1, $enqueued_modules );
-		$this->assertEquals( '/foo.js?ver=1.0', $enqueued_modules['foo'] );
+		$this->assertCount( 1, $enqueued_script_modules );
+		$this->assertEquals( '/foo.js?ver=1.0', $enqueued_script_modules['foo'] );
 		$this->assertCount( 1, $import_map );
 		$this->assertStringStartsWith( '/dep.js', $import_map['dep'] );
 	}