Add two test cases for ilo_construct_preload_links and remove integri…

…ty attr lifting
WordPress · Dec 12, 2023 · 46080ef · 46080ef
1 parent 3e77988
commit 46080ef
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 4 deletions.
diff --git a/modules/images/image-loading-optimization/optimization.php b/modules/images/image-loading-optimization/optimization.php
@@ -40,7 +40,7 @@ function ilo_construct_preload_links( array $lcp_elements_by_minimum_viewport_wi
 	$minimum_viewport_widths = array_keys( $lcp_elements_by_minimum_viewport_widths );
 	for ( $i = 0, $len = count( $minimum_viewport_widths ); $i < $len; $i++ ) {
 		$lcp_element = $lcp_elements_by_minimum_viewport_widths[ $minimum_viewport_widths[ $i ] ];
-		if ( false === $lcp_element || empty( $lcp_element['attributes'] ) ) {
+		if ( false === $lcp_element ) {
 			// No supported LCP element at this breakpoint, so nothing to preload.
 			continue;
 		}
@@ -173,7 +173,7 @@ function ilo_optimize_template_output_buffer( string $buffer ): string {
 		// Capture the attributes from the LCP elements to use in preload links.
 		if ( isset( $lcp_element_minimum_viewport_width_by_xpath[ $xpath ] ) ) {
 			$attributes = array();
-			foreach ( array( 'src', 'srcset', 'sizes', 'crossorigin', 'integrity' ) as $attr_name ) {
+			foreach ( array( 'src', 'srcset', 'sizes', 'crossorigin' ) as $attr_name ) {
 				$attributes[ $attr_name ] = $processor->get_attribute( $attr_name );
 			}
 			foreach ( $lcp_element_minimum_viewport_width_by_xpath[ $xpath ] as $minimum_viewport_width ) {

diff --git a/tests/modules/images/image-loading-optimization/optimization-tests.php b/tests/modules/images/image-loading-optimization/optimization-tests.php
@@ -29,14 +29,58 @@ public function test_ilo_maybe_add_template_output_buffer_filter() {
 		$this->assertSame( 10, has_filter( 'ilo_template_output_buffer', 'ilo_optimize_template_output_buffer' ) );
 	}
 
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_provider_test_ilo_construct_preload_links(): array {
+		return array(
+			'no-lcp-image'                 => array(
+				'lcp_elements_by_minimum_viewport_widths' => array(
+					0 => false,
+				),
+				'expected'                                => '',
+			),
+			'one-non-responsive-lcp-image' => array(
+				'lcp_elements_by_minimum_viewport_widths' => array(
+					0 => array(
+						'attributes' => array(
+							'src' => 'https://example.com/image.jpg',
+						),
+					),
+				),
+				'expected'                                => '
+					<link data-ilo-added-tag rel="preload" fetchpriority="high" as="image" href="https://example.com/image.jpg">
+				',
+			),
+			'one-responsive-lcp-image'     => array(
+				'lcp_elements_by_minimum_viewport_widths' => array(
+					0 => array(
+						'attributes' => array(
+							'src'         => 'elva-fairy-800w.jpg',
+							'srcset'      => 'elva-fairy-480w.jpg 480w, elva-fairy-800w.jpg 800w',
+							'sizes'       => '(max-width: 600px) 480px, 800px',
+							'crossorigin' => 'anonymous',
+						),
+					),
+				),
+				'expected'                                => '
+					<link data-ilo-added-tag rel="preload" fetchpriority="high" as="image" imagesrcset="elva-fairy-480w.jpg 480w, elva-fairy-800w.jpg 800w" imagesizes="(max-width: 600px) 480px, 800px" crossorigin="anonymous">
+				',
+			),
+		);
+	}
+
 	/**
 	 * Test ilo_construct_preload_links().
 	 *
 	 * @test
 	 * @covers ::ilo_construct_preload_links
+	 * @dataProvider data_provider_test_ilo_construct_preload_links
 	 */
-	public function test_ilo_construct_preload_links() {
-		$this->markTestIncomplete();
+	public function test_ilo_construct_preload_links( array $lcp_elements_by_minimum_viewport_widths, string $expected ) {
+		$this->assertSame( trim( $expected ), trim( ilo_construct_preload_links( $lcp_elements_by_minimum_viewport_widths ) ) );
 	}
 
 	/**