diff --git a/plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php b/plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php index 2a5a841502..32f80c8752 100644 --- a/plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php +++ b/plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php @@ -120,8 +120,8 @@ public function __invoke( OD_Tag_Visitor_Context $context ): bool { * * @since 0.3.0 * - * @param string $embed_block_xpath XPath for the embed block FIGURE tag. For example: `/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]`. - * @return string XPath for the child DIV. For example: `/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]` + * @param string $embed_block_xpath XPath for the embed block FIGURE tag. For example: `/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]`. + * @return string XPath for the child DIV. For example: `/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]` */ private static function get_embed_wrapper_xpath( string $embed_block_xpath ): string { return $embed_block_xpath . '/*[1][self::DIV]'; diff --git a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/buffer.html index 56bd93b256..28a57fccb3 100644 --- a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/buffer.html @@ -4,75 +4,77 @@ ... - -
-
- -
-
+
+ +
+
+ +
+
- -
-
- - -
-
+ +
+
+ + +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
-
View this post on Instagram

A post shared by WordPress (@wordpress)

-
-
+ +
+
+
View this post on Instagram

A post shared by WordPress (@wordpress)

+
+
- -
-
-
@deeptomcruise

Sports!

♬ original sound – Metaphysic.ai
-
-
+ +
+
+
@deeptomcruise

Sports!

♬ original sound – Metaphysic.ai
+
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html index 322a209d8e..c48b204596 100644 --- a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html @@ -2,154 +2,156 @@ ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
-
- -
-
+
+ +
+
+ +
+
- -
-
- - -
-
+ +
+
+ + +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
-
View this post on Instagram

A post shared by WordPress (@wordpress)

-
-
+ +
+
+
View this post on Instagram

A post shared by WordPress (@wordpress)

+
+
- -
-
-
@deeptomcruise

Sports!

♬ original sound – Metaphysic.ai
-
-
+ +
+
+
@deeptomcruise

Sports!

♬ original sound – Metaphysic.ai
+
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
- -
-
+ +
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/set-up.php index 3d225e113c..2525c6d236 100644 --- a/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/set-up.php @@ -12,7 +12,7 @@ $elements[] = array_merge( $element_data, array( - 'xpath' => "/*[1][self::HTML]/*[2][self::BODY]/*[{$i}][self::FIGURE]/*[1][self::DIV]", + 'xpath' => "/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[{$i}][self::FIGURE]/*[1][self::DIV]", ) ); } diff --git a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/buffer.html b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/buffer.html index 9391c2c7b8..47d4d97aee 100644 --- a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/buffer.html @@ -4,21 +4,23 @@ ... -
-
- -
-
-
-
-
-

So I heard you like FIGURE?

- -
Tagline from Figurine embed.
-
- -
-
- +
+
+
+ +
+
+
+
+
+

So I heard you like FIGURE?

+ +
Tagline from Figurine embed.
+
+ +
+
+ +
diff --git a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html index f99d25c05e..2a29e765e1 100644 --- a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html @@ -2,37 +2,39 @@ ... - - - - + + + + -
-
- -
-
-
-
-
-

So I heard you like FIGURE?

- -
Tagline from Figurine embed.
-
- -
-
- - - +
+
+
+ +
+
+
+
+
+

So I heard you like FIGURE?

+ +
Tagline from Figurine embed.
+
+ +
+
+ +
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/set-up.php b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/set-up.php index 11de622ec9..50cba9d44a 100644 --- a/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/nested-figure-embed/set-up.php @@ -3,24 +3,24 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 1, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]/*[1][self::VIDEO]', 'isLCP' => false, 'intersectionRatio' => 1, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 654 ) ), ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]/*[1][self::DIV]/*[1][self::FIGURE]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]/*[1][self::DIV]/*[1][self::FIGURE]/*[2][self::VIDEO]', 'isLCP' => false, 'intersectionRatio' => 0, ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/buffer.html index 0803d5ed5a..362621c2eb 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/buffer.html @@ -4,11 +4,13 @@ ... -
-
- -
-
- +
+
+
+ +
+
+ +
diff --git a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html index c3a1b8e0bd..c6a3cf2efb 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html @@ -2,20 +2,22 @@ ... - - + + -
-
- -
-
- - - +
+
+
+ +
+
+ +
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/set-up.php index 17e51269c1..2a6649554a 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/buffer.html index 9c957acd56..ede2a7272c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/expected.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/expected.html index c0bb29c49e..e580503c37 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/expected.html @@ -2,15 +2,17 @@ ... - - - + + + -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/set-up.php index 42bc523381..2fb1521fe8 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-without-resized-data/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'intersectionRatio' => 1, // Intentionally omitting resizedBoundingClientRect here to test behavior when data isn't supplied. diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/buffer.html index 9c957acd56..ede2a7272c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/expected.html index 5610fc8926..e53cb21847 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/expected.html @@ -2,21 +2,23 @@ ... - - - - + + + + -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/set-up.php index dbfa3c75bd..1cc2c139b0 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'intersectionRatio' => 1, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/buffer.html index 9c957acd56..ede2a7272c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/expected.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/expected.html index d481d1bef8..f300335810 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/expected.html @@ -2,21 +2,23 @@ ... - - - - + + + + -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/set-up.php index 36d6e5fae9..682ccfc269 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/set-up.php @@ -3,7 +3,7 @@ foreach ( array_merge( od_get_breakpoint_max_widths(), array( 1000 ) ) as $i => $viewport_width ) { $elements = array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 + $i * 100 ) ), ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/buffer.html index 9c957acd56..ede2a7272c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/expected.html index e217666cad..a0ef7685f3 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/expected.html @@ -2,20 +2,22 @@ ... - - + + -
-
- - -
-
- - +
+
+
+ + +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/set-up.php index 9311cdcca0..9f87b44a6e 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/buffer.html index ecffd74acb..81beb68e3c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/expected.html index c3ec523a4e..08e66b88da 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/expected.html @@ -2,24 +2,26 @@ ... - - - - - - + + + + + + -
-
- - -
-
- - +
+
+
+ + +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/set-up.php index cfecce6ed7..4847aca6f3 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'intersectionRatio' => 1, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/buffer.html index ecffd74acb..81beb68e3c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/expected.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/expected.html index e5fc3312bd..a8d6b7c4c3 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/expected.html @@ -2,24 +2,26 @@ ... - - - - - - + + + + + + -
-
- - -
-
- - +
+
+
+ + +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/set-up.php index bdc8ebb68f..7acbe1f10a 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/set-up.php @@ -3,7 +3,7 @@ foreach ( array_merge( od_get_breakpoint_max_widths(), array( 1000 ) ) as $i => $viewport_width ) { $elements = array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 + $i * 100 ) ), ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/buffer.html index ecffd74acb..81beb68e3c 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/expected.html index c3339ee642..d048bbfcff 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/expected.html @@ -2,21 +2,23 @@ ... - - + + -
-
- - -
-
- - - +
+
+
+ + +
+
+
+ + + diff --git a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/set-up.php index 17e51269c1..2a6649554a 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/buffer.html index 68b62eaf87..fb5cfb1f20 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/buffer.html @@ -4,10 +4,12 @@ ... -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/expected.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/expected.html index 5b278b0eed..b16583acb8 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/expected.html @@ -2,18 +2,20 @@ ... - - - - + + + + -
-
- -
-
- - +
+
+
+ +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/set-up.php index b05196d890..102d5f8b15 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/set-up.php @@ -7,7 +7,7 @@ 'viewport_width' => 100, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 1, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/buffer.html index 68b62eaf87..fb5cfb1f20 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/buffer.html @@ -4,10 +4,12 @@ ... -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/expected.html index f7b7111417..7356a23765 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/expected.html @@ -2,20 +2,22 @@ ... - - - - + + + + -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/set-up.php index dbfa3c75bd..1cc2c139b0 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'intersectionRatio' => 1, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/buffer.html index 68b62eaf87..fb5cfb1f20 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/buffer.html @@ -4,10 +4,12 @@ ... -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/expected.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/expected.html index 847504e38b..d861c63867 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/expected.html @@ -2,20 +2,22 @@ ... - - - - + + + + -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/set-up.php index c661f4b8d3..c52c6729c7 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/set-up.php @@ -3,7 +3,7 @@ foreach ( array_merge( od_get_breakpoint_max_widths(), array( 1000 ) ) as $viewport_width ) { $elements = array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => true, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/buffer.html index 68b62eaf87..fb5cfb1f20 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/buffer.html @@ -4,10 +4,12 @@ ... -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/expected.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/expected.html index ea1bfd6435..73331474b9 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/expected.html @@ -2,16 +2,18 @@ ... - - + + -
-
- -
-
- - +
+
+
+ +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/set-up.php index 8930b1497a..bc19530841 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/set-up.php @@ -7,7 +7,7 @@ 'viewport_width' => 100, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/buffer.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/buffer.html index 68b62eaf87..fb5cfb1f20 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/buffer.html @@ -4,10 +4,12 @@ ... -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/expected.html b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/expected.html index 4705830b72..a6305e08d5 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/expected.html @@ -2,18 +2,20 @@ ... - - + + -
-
- -
-
+
+
+
+ +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/set-up.php b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/set-up.php index 9311cdcca0..9f87b44a6e 100644 --- a/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::FIGURE]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::FIGURE]/*[1][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0, 'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ), diff --git a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/buffer.html b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/buffer.html index ecffd74acb..81beb68e3c 100644 --- a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/buffer.html +++ b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/buffer.html @@ -4,11 +4,13 @@ ... -
-
- - -
-
+
+
+
+ + +
+
+
diff --git a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/expected.html b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/expected.html index 143969a766..ab7c7ea09e 100644 --- a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/expected.html +++ b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/expected.html @@ -4,12 +4,14 @@ ... -
-
- - -
-
- - +
+
+
+ + +
+
+
+ + diff --git a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/set-up.php b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/set-up.php index 5875f88652..60d662e15e 100644 --- a/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/set-up.php +++ b/plugins/embed-optimizer/tests/test-cases/too-many-bookmarks/set-up.php @@ -5,7 +5,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::BOGUS]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::BOGUS]', 'isLCP' => false, 'intersectionRatio' => 0.0, ), diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/buffer.html index 0abcfad9e3..a54e6a1852 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/buffer.html @@ -4,7 +4,9 @@ ... -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport except on desktop.

-
This is so background!
+
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport except on desktop.

+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/expected.html index 0abcfad9e3..a54e6a1852 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/expected.html @@ -4,7 +4,9 @@ ... -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport except on desktop.

-
This is so background!
+
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport except on desktop.

+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/set-up.php index 280d5adfcc..c7d8fba7e4 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/set-up.php @@ -26,7 +26,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => $non_desktop_viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, @@ -47,7 +47,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => 1000, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.3, ), diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/buffer.html b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/buffer.html index 7007816ea7..00a68ff76a 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/buffer.html @@ -4,7 +4,9 @@ ... -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
+
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/expected.html b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/expected.html index 9e9b2cb893..cb5f1530a8 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/expected.html @@ -4,8 +4,10 @@ ... -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
- - +
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/set-up.php b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/set-up.php index 2a425f1f9b..3ef73bb716 100644 --- a/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/set-up.php @@ -24,7 +24,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => $non_desktop_viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/buffer.html index c380a57308..d043f6d17f 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/buffer.html @@ -4,9 +4,11 @@ ... -
This is so background!
-

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
-
This is so background!
+
+
This is so background!
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/expected.html index 6fcf6c1818..549d6b729b 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/expected.html @@ -2,16 +2,18 @@ ... - - - + + + -
This is so background!
-

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
-
This is so background!
- - +
+
This is so background!
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
This is so background!
+
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/set-up.php index 2fc886c75d..fa65a15bb6 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-and-lazy-loaded-background-image-outside-viewport-with-fully-populated-sample-data/set-up.php @@ -10,18 +10,18 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::DIV]', 'isLCP' => true, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, 'boundingClientRect' => $outside_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/buffer.html index f249105b62..9a0996ee98 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/buffer.html @@ -4,6 +4,8 @@ ... -
This is so background!
+
+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/expected.html index 3eedbfbb1a..f59ac220e2 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/expected.html @@ -2,9 +2,11 @@ ... - - + + -
This is so background!
+
+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/set-up.php index 5705431c89..d4e91b99df 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-background-image-with-fully-populated-sample-data/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::DIV]', 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/buffer.html index fd56c09054..06087ee6b6 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/buffer.html @@ -4,16 +4,18 @@ ... -
- Foo - Foo - Foo +
+
+ Foo + Foo + Foo +
+

Pretend this is a super long paragraph that pushes the next image mostly out of the initial viewport.

+ Bar +

Now the following image is definitely outside the initial viewport.

+ Baz + Qux + Quux
-

Pretend this is a super long paragraph that pushes the next image mostly out of the initial viewport.

- Bar -

Now the following image is definitely outside the initial viewport.

- Baz - Qux - Quux diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/expected.html index 9c86ad2d03..0d86051f12 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/expected.html @@ -2,19 +2,21 @@ ... - - + + -
- Foo - Foo - Foo +
+
+ Foo + Foo + Foo +
+

Pretend this is a super long paragraph that pushes the next image mostly out of the initial viewport.

+ Bar +

Now the following image is definitely outside the initial viewport.

+ Baz + Qux + Quux
-

Pretend this is a super long paragraph that pushes the next image mostly out of the initial viewport.

- Bar -

Now the following image is definitely outside the initial viewport.

- Baz - Qux - Quux diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/set-up.php index cfd7906f67..5255188173 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/set-up.php @@ -17,41 +17,41 @@ 'viewport_width' => $viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::DIV]/*[2][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, // Subsequent carousel slide. ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::DIV]/*[3][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, // Subsequent carousel slide. ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0 === $i ? 0.5 : 0.0, // Make sure that the _max_ intersection ratio is considered. ), // All are outside all initial viewports. array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[5][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, 'boundingClientRect' => $outside_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[6][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[6][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, 'boundingClientRect' => $outside_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[7][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[7][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/buffer.html index 0768d1bba5..79a5242e9b 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/buffer.html @@ -4,7 +4,9 @@ ... - Foo - Bar +
+ Foo + Bar +
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/expected.html index f0921a5b7f..a3efb5a545 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/expected.html @@ -2,11 +2,13 @@ ... - - + + - Foo - Bar - - +
+ Foo + Bar +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/set-up.php index 5245874348..33939b37ac 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-fully-incomplete-sample-data/set-up.php @@ -12,11 +12,11 @@ 'viewport_width' => 1000, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', 'isLCP' => false, ), ), diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/buffer.html index b7ab0a6e7f..5112765124 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/buffer.html @@ -4,7 +4,9 @@ ... - - Foo +
+ + Foo +
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/expected.html index be33b7db18..9ca3e71b90 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/expected.html @@ -4,7 +4,9 @@ ... - - Foo +
+ + Foo +
diff --git a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/set-up.php index eae422f980..0ccab59cec 100644 --- a/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/common-lcp-image-with-stale-sample-data/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', // Note: This is intentionally not reflecting the IMG in the HTML below. + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', // Note: This is intentionally not reflecting the IMG in the HTML below. 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/buffer.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/buffer.html index 08b34f718e..b9db62b510 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/buffer.html @@ -4,10 +4,12 @@ ... - Mobile Logo - Phablet Logo - Tablet Logo - Desktop Logo - Desktop Logo +
+ Mobile Logo + Phablet Logo + Tablet Logo + Desktop Logo + Desktop Logo +
diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/expected.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/expected.html index 02c6382a34..516fc4bf1c 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/expected.html @@ -2,18 +2,20 @@ ... - - - - - - + + + + + + - Mobile Logo - Phablet Logo - Tablet Logo - Desktop Logo - Desktop Logo - - +
+ Mobile Logo + Phablet Logo + Tablet Logo + Desktop Logo + Desktop Logo +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/set-up.php b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/set-up.php index 5fe32b6c59..e8f0ca8090 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-all-breakpoints/set-up.php @@ -13,23 +13,23 @@ static function () use ( $breakpoint_max_widths ) { $elements = array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[5][self::IMG]', ), ); $elements[ $i ]['isLCP'] = true; diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/buffer.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/buffer.html index b7502d1d40..3a5bb0070b 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/buffer.html @@ -5,7 +5,9 @@ - Mobile Logo - Desktop Logo +
+ Mobile Logo + Desktop Logo +
diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/expected.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/expected.html index c5781977a5..f6ca681fae 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/expected.html @@ -3,12 +3,14 @@ ... - - - + + + - Mobile Logo - Desktop Logo - - +
+ Mobile Logo + Desktop Logo +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/set-up.php b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/set-up.php index 8f56d38029..202a68a342 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-non-consecutive-viewport-groups-with-missing-data-for-middle-group/set-up.php @@ -8,12 +8,12 @@ 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'intersectionRatio' => 1.0, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', 'intersectionRatio' => 0.0, ), ), @@ -28,12 +28,12 @@ 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'intersectionRatio' => 0.0, ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', 'intersectionRatio' => 1.0, ), ), diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/buffer.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/buffer.html index f4b88a7304..c7e1f6daa7 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/buffer.html @@ -4,8 +4,10 @@ ... - Mobile Logo -

New paragraph since URL Metrics were captured!

- Desktop Logo +
+ Mobile Logo +

New paragraph since URL Metrics were captured!

+ Desktop Logo +
diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/expected.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/expected.html index 6bee1a789b..77ea9669f4 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/expected.html @@ -2,12 +2,14 @@ ... - - + + - Mobile Logo -

New paragraph since URL Metrics were captured!

- Desktop Logo - - +
+ Mobile Logo +

New paragraph since URL Metrics were captured!

+ Desktop Logo +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/set-up.php b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/set-up.php index b76c614a1c..6b261511bf 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints-and-one-is-stale/set-up.php @@ -15,11 +15,11 @@ static function () { 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -33,11 +33,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -51,11 +51,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -69,11 +69,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/buffer.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/buffer.html index 2bd61f3b57..7ac575d71f 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/buffer.html @@ -4,7 +4,9 @@ ... - Mobile Logo - Desktop Logo +
+ Mobile Logo + Desktop Logo +
diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/expected.html b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/expected.html index a96a8b2651..7c17417d0c 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/expected.html @@ -2,12 +2,14 @@ ... - - - + + + - Mobile Logo - Desktop Logo - - +
+ Mobile Logo + Desktop Logo +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/set-up.php b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/set-up.php index 9f7e2e8b8a..2f8bf14ee2 100644 --- a/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/different-lcp-elements-for-two-non-consecutive-breakpoints/set-up.php @@ -15,11 +15,11 @@ static function () { 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -33,11 +33,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -51,11 +51,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) @@ -69,11 +69,11 @@ static function () { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/buffer.html index 9625aca291..76d0967e0a 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/buffer.html @@ -4,6 +4,8 @@ ... - Foo +
+ Foo +
diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/expected.html index 733378cd43..38b01e516e 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/expected.html @@ -2,9 +2,11 @@ ... - - + + - Foo +
+ Foo +
diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/set-up.php index 4ca130adb0..9b3b741779 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-already-on-common-lcp-image-with-fully-populated-sample-data/set-up.php @@ -4,7 +4,7 @@ array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), ) ); diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/buffer.html b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/buffer.html index 9625aca291..76d0967e0a 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/buffer.html @@ -4,6 +4,8 @@ ... - Foo +
+ Foo +
diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/expected.html b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/expected.html index 0ded759414..0daed966be 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/expected.html @@ -2,11 +2,13 @@ ... - - - + + + - Foo - - +
+ Foo +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/set-up.php b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/set-up.php index ddb684f1f0..06a6267862 100644 --- a/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/fetch-priority-high-on-lcp-image-common-on-mobile-and-desktop-with-url-metrics-missing-in-other-groups/set-up.php @@ -16,7 +16,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => 375, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), ), @@ -31,7 +31,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => 1000, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), ), diff --git a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/buffer.html b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/buffer.html index 19379dcba5..764762500a 100644 --- a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/buffer.html @@ -4,12 +4,14 @@ ... - - Left of Viewport - Above viewport - Right of viewport - - - Below viewport +
+ + Left of Viewport + Above viewport + Right of viewport + + + Below viewport +
diff --git a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/expected.html b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/expected.html index ede89f5525..eb6b1bb352 100644 --- a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/expected.html @@ -4,12 +4,14 @@ ... - - Left of Viewport - Above viewport - Right of viewport - - - Below viewport +
+ + Left of Viewport + Above viewport + Right of viewport + + + Below viewport +
diff --git a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/set-up.php b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/set-up.php index e0c288fb67..bd3d8e1ea2 100644 --- a/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/images-located-above-or-along-initial-viewport/set-up.php @@ -33,28 +33,28 @@ 'viewport_width' => $viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $above_viewport_rect, 'boundingClientRect' => $above_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $left_of_viewport_rect, 'boundingClientRect' => $left_of_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $right_of_viewport_rect, 'boundingClientRect' => $right_of_viewport_rect, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $below_viewport_rect, diff --git a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/buffer.html b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/buffer.html index 379c6a9886..e916421ad0 100644 --- a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/buffer.html @@ -5,10 +5,12 @@ - - Bar - +
+ + Bar + +
diff --git a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/expected.html b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/expected.html index 033d43ee87..b3c0ac6105 100644 --- a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/expected.html @@ -5,11 +5,13 @@ - - Bar - - - +
+ + Bar + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/set-up.php b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/set-up.php index 8557f3ab7a..50d5157da3 100644 --- a/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/img-non-native-lazy-loading/set-up.php @@ -10,7 +10,7 @@ 'viewport_width' => 1000, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), ), diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/buffer.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/buffer.html index 26cd97296d..bf29c0fccb 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/buffer.html @@ -5,8 +5,10 @@ - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/expected.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/expected.html index 7799dc6155..16279e8784 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-complete-samples-but-element-absent/expected.html @@ -3,11 +3,13 @@ ... - - + + - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/buffer.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/buffer.html index 26cd97296d..bf29c0fccb 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/buffer.html @@ -5,8 +5,10 @@ - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/expected.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/expected.html index 0125683359..155079f792 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-fully-populated-samples/expected.html @@ -3,14 +3,16 @@ ... - - - - - + + + + + - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/buffer.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/buffer.html index 26cd97296d..bf29c0fccb 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/buffer.html @@ -5,8 +5,10 @@ - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/expected.html b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/expected.html index e18ae0468b..58216fe72c 100644 --- a/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/lcp-element-external-background-image-present-in-document-and-partially-populated-samples/expected.html @@ -3,12 +3,14 @@ ... - - + + - - - +
+ +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/buffer.html b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/buffer.html index f9fecfeb02..0ffa89c972 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/buffer.html @@ -4,10 +4,12 @@ ... - - - - - +
+ + + + + +
diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/expected.html b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/expected.html index 48d0d7e974..876abe7c78 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/expected.html @@ -2,15 +2,17 @@ ... - - + + - - - - - - - - +
+ + + + + +
+ + + diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/set-up.php b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/set-up.php index 365e220943..7c22f783a9 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-on-all-breakpoints/set-up.php @@ -18,25 +18,25 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 1.0, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.1, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.0, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.0, ), diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/buffer.html b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/buffer.html index b40f7755ea..565fc6b422 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/buffer.html @@ -4,10 +4,12 @@ ... - - - - - +
+ + + + + +
diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/expected.html b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/expected.html index 9701daf46e..b0da6ab699 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/expected.html @@ -2,14 +2,16 @@ ... - - + + - - - - - - - +
+ + + + + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/set-up.php b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/set-up.php index da17074dd4..4773307eb9 100644 --- a/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/multiple-videos-with-desktop-metrics-missing/set-up.php @@ -18,25 +18,25 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 1.0, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.1, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.0, ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 0.0, ), diff --git a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/buffer.html index 65baae2cd1..d9076391b1 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/buffer.html @@ -4,6 +4,8 @@ ... -

Hello World

+
+

Hello World

+
diff --git a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/expected.html b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/expected.html index 65baae2cd1..d9076391b1 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/expected.html @@ -4,6 +4,8 @@ ... -

Hello World

+
+

Hello World

+
diff --git a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/set-up.php b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/set-up.php index 7eec72c2bb..33ef607ccc 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/no-lcp-image-or-background-image-outside-viewport-with-populated-url-metrics/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::H1]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::H1]', 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/buffer.html index a32e971469..2498077e3b 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/buffer.html @@ -4,9 +4,11 @@ ... - Foo - Bar - Baz - Qux +
+ Foo + Bar + Baz + Qux +
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/expected.html index 869e116f99..3e87268e2e 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-but-server-side-heuristics-added-fetchpriority-high/expected.html @@ -4,10 +4,12 @@ ... - Foo - Bar - Baz - Qux - - +
+ Foo + Bar + Baz + Qux +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/buffer.html index d6ab976885..f1d7e73280 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/buffer.html @@ -4,7 +4,9 @@ ... - - +
+ + +
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/expected.html index bf7f01d02c..4034e7d973 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-for-image-without-src/expected.html @@ -4,8 +4,10 @@ ... - - - - +
+ + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/buffer.html index 9b88043beb..91bec5b9a9 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/buffer.html @@ -4,6 +4,8 @@ ... -
This is so background!
+
+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/expected.html index d0006c7dee..2918701f00 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-background-image/expected.html @@ -4,7 +4,9 @@ ... -
This is so background!
- - +
+
This is so background!
+
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/buffer.html index de45145533..cc24fb7331 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/buffer.html @@ -4,6 +4,8 @@ ... - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/expected.html index 3627bfeaec..21f67a076c 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-data-url-image/expected.html @@ -4,7 +4,9 @@ ... - - - +
+ +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/buffer.html index 980fffa28e..dd313677ea 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/buffer.html @@ -4,6 +4,8 @@ ... -
This is so background!
+
+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/expected.html index 19e0fe3870..82f323ca7f 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics-with-non-background-image-style/expected.html @@ -4,7 +4,9 @@ ... -
This is so background!
- - +
+
This is so background!
+
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics/buffer.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics/buffer.html index facc54d149..52b333b316 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics/buffer.html @@ -4,8 +4,10 @@ ... - Foo -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
+
+ Foo +

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/no-url-metrics/expected.html b/plugins/image-prioritizer/tests/test-cases/no-url-metrics/expected.html index 0385aaeb19..532c59d01d 100644 --- a/plugins/image-prioritizer/tests/test-cases/no-url-metrics/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/no-url-metrics/expected.html @@ -4,9 +4,11 @@ ... - Foo -

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
- - +
+ Foo +

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/buffer.html b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/buffer.html index af4cbef1bf..16e902693f 100644 --- a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/buffer.html @@ -4,28 +4,30 @@ ... -

Example

-
-
-

Last Post

-
-

This post has no featured image!

-

This paragraph adds vertical height.

-

So does this one.

-

And this one too.

-
-
-
-

First Post

-
- Featured Image -
-
-

This post does have a featured image, and the server-side heuristics in WordPress cause it to get fetchpriority=high, but it should not have this since it is out of the viewport on mobile.

-
-
-

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
-
+
+

Example

+
+
+

Last Post

+
+

This post has no featured image!

+

This paragraph adds vertical height.

+

So does this one.

+

And this one too.

+
+
+
+

First Post

+
+ Featured Image +
+
+

This post does have a featured image, and the server-side heuristics in WordPress cause it to get fetchpriority=high, but it should not have this since it is out of the viewport on mobile.

+
+
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
+
diff --git a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/expected.html b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/expected.html index b7d0657881..db2174a338 100644 --- a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/expected.html @@ -2,36 +2,38 @@ ... - - - + + + -

Example

-
-
-

Last Post

-
-

This post has no featured image!

-

This paragraph adds vertical height.

-

So does this one.

-

And this one too.

-
-
-
-

First Post

-
- Featured Image -
-
-

This post does have a featured image, and the server-side heuristics in WordPress cause it to get fetchpriority=high, but it should not have this since it is out of the viewport on mobile.

-
-
-

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

-
This is so background!
-
+
+

Example

+
+
+

Last Post

+
+

This post has no featured image!

+

This paragraph adds vertical height.

+

So does this one.

+

And this one too.

+
+
+
+

First Post

+
+ Featured Image +
+
+

This post does have a featured image, and the server-side heuristics in WordPress cause it to get fetchpriority=high, but it should not have this since it is out of the viewport on mobile.

+
+
+

Pretend this is a super long paragraph that pushes the next div out of the initial viewport.

+
This is so background!
+
+
- - + + diff --git a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/set-up.php b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/set-up.php index b6c8fffcb0..6699e0a2c7 100644 --- a/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/only-mobile-and-desktop-groups-are-populated/set-up.php @@ -27,12 +27,12 @@ static function () { 'viewport_width' => $viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MAIN]/*[2][self::ARTICLE]/*[2][self::FIGURE]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MAIN]/*[2][self::ARTICLE]/*[2][self::FIGURE]/*[1][self::IMG]', 'isLCP' => $viewport_width > 600, 'intersectionRatio' => $viewport_width > 600 ? 1.0 : 0.1, ), array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MAIN]/*[4][self::DIV]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MAIN]/*[4][self::DIV]', 'isLCP' => false, 'intersectionRatio' => 0.0, 'intersectionRect' => $outside_viewport_rect, diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/buffer.html b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/buffer.html index f9551830e1..d7fe28a554 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/buffer.html @@ -4,10 +4,12 @@ ... - - - - Foo - +
+ + + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/expected.html b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/expected.html index 0e3a2e34a1..2005e0583e 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/expected.html @@ -2,14 +2,16 @@ ... - - + + - - - - Foo - - - +
+ + + + Foo + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/set-up.php b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/set-up.php index fa26a8645d..52b6a8101d 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-as-lcp-tablet-and-desktop-metrics-missing/set-up.php @@ -22,7 +22,7 @@ static function () use ( $breakpoint_max_widths ) { 'viewport_width' => $viewport_width, 'elements' => array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::PICTURE]/*[3][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::PICTURE]/*[3][self::IMG]', 'isLCP' => true, ), ), diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/buffer.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/buffer.html index 8f31bc7122..47d57224ea 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/buffer.html @@ -4,9 +4,11 @@ ... - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/expected.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/expected.html index 966d285ac4..f42e7fd2b4 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/expected.html @@ -2,12 +2,14 @@ ... - - + + - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/set-up.php b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/set-up.php index 457738c9d5..db243b1d83 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-lcp-image-and-fully-populated-sample-data/set-up.php @@ -12,7 +12,7 @@ static function () use ( $breakpoint_max_widths ) { $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::PICTURE]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::PICTURE]/*[2][self::IMG]', 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/buffer.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/buffer.html index 21b3c1de68..0ba6b3b122 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/buffer.html @@ -4,9 +4,11 @@ ... - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/expected.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/expected.html index b5d3b01643..1ce78a0f70 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/expected.html @@ -4,9 +4,11 @@ ... - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/set-up.php b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/set-up.php index 457738c9d5..db243b1d83 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-having-media-attribute/set-up.php @@ -12,7 +12,7 @@ static function () use ( $breakpoint_max_widths ) { $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::PICTURE]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::PICTURE]/*[2][self::IMG]', 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/buffer.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/buffer.html index 1019a51986..f9a52c8ba9 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/buffer.html @@ -4,9 +4,11 @@ ... - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/expected.html b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/expected.html index a39685cd25..50244f0fbb 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/expected.html @@ -4,9 +4,11 @@ ... - - - Foo - +
+ + + Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/set-up.php b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/set-up.php index 457738c9d5..db243b1d83 100644 --- a/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/picture-element-with-source-missing-type-attribute/set-up.php @@ -12,7 +12,7 @@ static function () use ( $breakpoint_max_widths ) { $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::PICTURE]/*[2][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::PICTURE]/*[2][self::IMG]', 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/buffer.html b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/buffer.html index fc01ded2df..3ec36078cb 100644 --- a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/buffer.html @@ -5,8 +5,10 @@ -
This is the desktop background!
-
This is the tablet background!
-
This is the mobile background!
+
+
This is the desktop background!
+
This is the tablet background!
+
This is the mobile background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/expected.html b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/expected.html index c5fb84b8ac..584e5ab160 100644 --- a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/expected.html @@ -3,13 +3,15 @@ ... - - - - + + + + -
This is the desktop background!
-
This is the tablet background!
-
This is the mobile background!
+
+
This is the desktop background!
+
This is the tablet background!
+
This is the mobile background!
+
diff --git a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/set-up.php b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/set-up.php index b806a124b3..68f281a119 100644 --- a/plugins/image-prioritizer/tests/test-cases/responsive-background-images/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/responsive-background-images/set-up.php @@ -26,7 +26,7 @@ static function () use ( $mobile_breakpoint, $tablet_breakpoint ): array { array( 'viewport_width' => $viewport_width, 'element' => array( - 'xpath' => sprintf( '/*[1][self::HTML]/*[2][self::BODY]/*[%d][self::DIV]', $div_index + 1 ), + 'xpath' => sprintf( '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[%d][self::DIV]', $div_index + 1 ), 'isLCP' => true, ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/buffer.html b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/buffer.html index b986604607..1819dbc728 100644 --- a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/buffer.html @@ -6,8 +6,10 @@ - Foo - +
+ Foo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/expected.html b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/expected.html index 6bc8456da0..03b7499cfb 100644 --- a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/expected.html @@ -3,13 +3,15 @@ ... - - + + - Foo - - - +
+ Foo + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/set-up.php b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/set-up.php index 6b2c6716ee..a1923410c4 100644 --- a/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/url-metric-only-captured-for-one-breakpoint/set-up.php @@ -7,7 +7,7 @@ 'viewport_width' => 400, 'element' => array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), ) ) diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/buffer.html index 3a81bf3bba..d6ffe4fccd 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/buffer.html @@ -4,9 +4,11 @@ ... - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/expected.html b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/expected.html index d08a2dbac1..1d0006046e 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/expected.html @@ -4,10 +4,12 @@ ... - - - +
+ +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/set-up.php index 4303ff524a..f663c75b1c 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-collected/set-up.php @@ -10,7 +10,7 @@ static function () use ( $breakpoint_max_widths ) { $element = array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 1.0, ); diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/buffer.html index 3a81bf3bba..d6ffe4fccd 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/buffer.html @@ -4,9 +4,11 @@ ... - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/expected.html b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/expected.html index 14c0f8982a..02cc2f2864 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/expected.html @@ -4,10 +4,12 @@ ... - - - +
+ +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/set-up.php index 6ef70aa802..2589594cb7 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-with-large-poster-and-desktop-url-metrics-missing/set-up.php @@ -10,7 +10,7 @@ static function () use ( $breakpoint_max_widths ) { $element = array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', 'boundingClientRect' => $test_case->get_sample_dom_rect(), 'intersectionRatio' => 1.0, ); diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/buffer.html index fb9d4afa30..2c3b0cd12f 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/buffer.html @@ -4,6 +4,8 @@ ... - +
+ +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/expected.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/expected.html index 3c75024e78..64601fe7ad 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/expected.html @@ -2,10 +2,12 @@ ... - - + + - - - +
+ +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/set-up.php index 284174b8bd..1705ead0a1 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-all-breakpoints/set-up.php @@ -18,7 +18,7 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/buffer.html index 3bda24259c..fed90104be 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/buffer.html @@ -4,10 +4,12 @@ ... - Mobile Logo - +
+ Mobile Logo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/expected.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/expected.html index 9b988a719e..3f42d8f1ed 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/expected.html @@ -2,15 +2,17 @@ ... - - - + + + - Mobile Logo - - - +
+ Mobile Logo + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/set-up.php index 00cb163791..7839bbc022 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-desktop-only/set-up.php @@ -13,11 +13,11 @@ static function () use ( $breakpoint_max_widths ) { $elements = array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ); OD_URL_Metrics_Post_Type::store_url_metric( @@ -39,11 +39,11 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/buffer.html index 4c41211324..fd70765216 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/buffer.html @@ -4,7 +4,9 @@ ... - Tablet header - +
+ Tablet header + +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/expected.html b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/expected.html index aa22699823..b3afaa04c8 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/expected.html @@ -2,13 +2,15 @@ ... - - - - + + + + - Tablet header - - - +
+ Tablet header + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/set-up.php index 380e2ea1fd..c1670ae40f 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-with-poster-lcp-element-on-mobile-and-desktop-but-not-tablet/set-up.php @@ -17,11 +17,11 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ), ) @@ -32,11 +32,11 @@ static function () use ( $breakpoint_max_widths ) { $elements = array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ); OD_URL_Metrics_Post_Type::store_url_metric( @@ -58,11 +58,11 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/buffer.html b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/buffer.html index d403150444..0d4628fb0d 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/buffer.html +++ b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/buffer.html @@ -4,10 +4,12 @@ ... - Mobile Logo - +
+ Mobile Logo + +
diff --git a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/expected.html b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/expected.html index 7c5dad5fbe..af759ee18c 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/expected.html +++ b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/expected.html @@ -2,14 +2,16 @@ ... - - + + - Mobile Logo - - - +
+ Mobile Logo + +
+ + diff --git a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/set-up.php b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/set-up.php index bae0255446..466205ef0e 100644 --- a/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/set-up.php +++ b/plugins/image-prioritizer/tests/test-cases/video-without-poster-lcp-element-on-desktop-only/set-up.php @@ -13,11 +13,11 @@ static function () use ( $breakpoint_max_widths ) { $elements = array( array( 'isLCP' => true, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::VIDEO]', ), ); OD_URL_Metrics_Post_Type::store_url_metric( @@ -39,7 +39,7 @@ static function () use ( $breakpoint_max_widths ) { 'elements' => array( array( 'isLCP' => false, - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', ), ), ) diff --git a/plugins/image-prioritizer/tests/test-helper.php b/plugins/image-prioritizer/tests/test-helper.php index bd0e8389cb..cb8e74fd8e 100644 --- a/plugins/image-prioritizer/tests/test-helper.php +++ b/plugins/image-prioritizer/tests/test-helper.php @@ -113,7 +113,7 @@ public function data_provider_test_auto_sizes(): array { // Note: The Image Prioritizer plugin removes the loading attribute, and so then Auto Sizes does not then add sizes=auto. 'wrongly_lazy_responsive_img' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 1, ), @@ -123,7 +123,7 @@ public function data_provider_test_auto_sizes(): array { 'non_responsive_image' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0, 'intersectionRect' => $outside_viewport_rect, @@ -135,7 +135,7 @@ public function data_provider_test_auto_sizes(): array { 'auto_sizes_added' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0, 'intersectionRect' => $outside_viewport_rect, @@ -147,7 +147,7 @@ public function data_provider_test_auto_sizes(): array { 'auto_sizes_already_added' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 0, 'intersectionRect' => $outside_viewport_rect, @@ -160,7 +160,7 @@ public function data_provider_test_auto_sizes(): array { // If Auto Sizes added the sizes=auto attribute but Image Prioritizer ended up removing it due to the image not being lazy-loaded, remove sizes=auto again. 'wrongly_auto_sized_responsive_img' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 1, ), @@ -170,7 +170,7 @@ public function data_provider_test_auto_sizes(): array { 'wrongly_auto_sized_responsive_img_with_only_auto' => array( 'element_metrics' => array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'intersectionRatio' => 1, ), @@ -191,12 +191,12 @@ public function data_provider_test_auto_sizes(): array { public function test_auto_sizes_end_to_end( array $element_metrics, string $buffer, string $expected ): void { $this->populate_url_metrics( array( $element_metrics ) ); - $html_start_doc = '...'; - $html_end_doc = ''; + $html_start_doc = '...
'; + $html_end_doc = '
'; $buffer = od_optimize_template_output_buffer( $html_start_doc . $buffer . $html_end_doc ); - $buffer = preg_replace( '#.+?]*>#s', '', $buffer ); - $buffer = preg_replace( '#.*$#s', '', $buffer ); + $buffer = preg_replace( '#.+?]*>]*>#s', '', $buffer ); + $buffer = preg_replace( '#
.*$#s', '', $buffer ); $this->assertEquals( $this->remove_initial_tabs( $expected ), diff --git a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/buffer.html b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/buffer.html index 89eadd7d29..9d17b1daaa 100644 --- a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/buffer.html @@ -4,6 +4,8 @@ ... - Foo +
+ Foo +
diff --git a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/expected.html b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/expected.html index 89eadd7d29..9d17b1daaa 100644 --- a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/expected.html +++ b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/expected.html @@ -4,6 +4,8 @@ ... - Foo +
+ Foo +
diff --git a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/set-up.php b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/set-up.php index 88386662ba..7d1990f353 100644 --- a/plugins/optimization-detective/tests/test-cases/complete-url-metrics/set-up.php +++ b/plugins/optimization-detective/tests/test-cases/complete-url-metrics/set-up.php @@ -11,7 +11,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => true, ), ) diff --git a/plugins/optimization-detective/tests/test-cases/many-images/buffer.html b/plugins/optimization-detective/tests/test-cases/many-images/buffer.html index 3e16876c64..dd47c9b2a0 100644 --- a/plugins/optimization-detective/tests/test-cases/many-images/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/many-images/buffer.html @@ -4,1005 +4,1007 @@ ... - Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo +
+ Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo +
diff --git a/plugins/optimization-detective/tests/test-cases/many-images/expected.html b/plugins/optimization-detective/tests/test-cases/many-images/expected.html index 043e42abd6..9b2a046b6a 100644 --- a/plugins/optimization-detective/tests/test-cases/many-images/expected.html +++ b/plugins/optimization-detective/tests/test-cases/many-images/expected.html @@ -4,1006 +4,1008 @@ ... - Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo -Foo - - +
+ Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo + Foo +
+ + diff --git a/plugins/optimization-detective/tests/test-cases/many-images/set-up.php b/plugins/optimization-detective/tests/test-cases/many-images/set-up.php index 360f759370..efec314422 100644 --- a/plugins/optimization-detective/tests/test-cases/many-images/set-up.php +++ b/plugins/optimization-detective/tests/test-cases/many-images/set-up.php @@ -3,7 +3,7 @@ $elements = array(); for ( $i = 1; $i < WP_HTML_Tag_Processor::MAX_SEEK_OPS; $i++ ) { $elements[] = array( - 'xpath' => sprintf( '/*[1][self::HTML]/*[2][self::BODY]/*[%d][self::IMG]', $i ), + 'xpath' => sprintf( '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[%d][self::IMG]', $i ), 'isLCP' => false, ); } diff --git a/plugins/optimization-detective/tests/test-cases/no-url-metrics/buffer.html b/plugins/optimization-detective/tests/test-cases/no-url-metrics/buffer.html index 89eadd7d29..9d17b1daaa 100644 --- a/plugins/optimization-detective/tests/test-cases/no-url-metrics/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/no-url-metrics/buffer.html @@ -4,6 +4,8 @@ ... - Foo +
+ Foo +
diff --git a/plugins/optimization-detective/tests/test-cases/no-url-metrics/expected.html b/plugins/optimization-detective/tests/test-cases/no-url-metrics/expected.html index 18a5a0ff9f..089c14d835 100644 --- a/plugins/optimization-detective/tests/test-cases/no-url-metrics/expected.html +++ b/plugins/optimization-detective/tests/test-cases/no-url-metrics/expected.html @@ -4,7 +4,9 @@ ... - Foo - - +
+ Foo +
+ + diff --git a/plugins/optimization-detective/tests/test-cases/noscript/buffer.html b/plugins/optimization-detective/tests/test-cases/noscript/buffer.html index 6f1c23c82c..532948b625 100644 --- a/plugins/optimization-detective/tests/test-cases/noscript/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/noscript/buffer.html @@ -4,8 +4,10 @@ ... - +
+ +
diff --git a/plugins/optimization-detective/tests/test-cases/noscript/expected.html b/plugins/optimization-detective/tests/test-cases/noscript/expected.html index 30b6792de9..b2d736475d 100644 --- a/plugins/optimization-detective/tests/test-cases/noscript/expected.html +++ b/plugins/optimization-detective/tests/test-cases/noscript/expected.html @@ -4,9 +4,11 @@ ... - - - +
+ +
+ + diff --git a/plugins/optimization-detective/tests/test-cases/video/buffer.html b/plugins/optimization-detective/tests/test-cases/video/buffer.html index 2c47d4f149..e7f5bd8872 100644 --- a/plugins/optimization-detective/tests/test-cases/video/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/video/buffer.html @@ -4,9 +4,11 @@ ... - +
+ +
diff --git a/plugins/optimization-detective/tests/test-cases/video/expected.html b/plugins/optimization-detective/tests/test-cases/video/expected.html index c0a3fb3f30..742fee6527 100644 --- a/plugins/optimization-detective/tests/test-cases/video/expected.html +++ b/plugins/optimization-detective/tests/test-cases/video/expected.html @@ -4,10 +4,12 @@ ... - - - +
+ +
+ + diff --git a/plugins/optimization-detective/tests/test-cases/video/set-up.php b/plugins/optimization-detective/tests/test-cases/video/set-up.php index 384ddcc85d..aa21210ccb 100644 --- a/plugins/optimization-detective/tests/test-cases/video/set-up.php +++ b/plugins/optimization-detective/tests/test-cases/video/set-up.php @@ -3,7 +3,7 @@ $test_case->populate_url_metrics( array( array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::VIDEO]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::VIDEO]', 'isLCP' => true, ), ), diff --git a/plugins/optimization-detective/tests/test-cases/xhtml-response/buffer.html b/plugins/optimization-detective/tests/test-cases/xhtml-response/buffer.html index dcfae2532a..0072f43ef0 100644 --- a/plugins/optimization-detective/tests/test-cases/xhtml-response/buffer.html +++ b/plugins/optimization-detective/tests/test-cases/xhtml-response/buffer.html @@ -6,6 +6,8 @@ XHTML 1.0 Strict Example -

Foo

+
+

Foo

+
diff --git a/plugins/optimization-detective/tests/test-cases/xhtml-response/expected.html b/plugins/optimization-detective/tests/test-cases/xhtml-response/expected.html index dbfc231b92..6f5bb0009d 100644 --- a/plugins/optimization-detective/tests/test-cases/xhtml-response/expected.html +++ b/plugins/optimization-detective/tests/test-cases/xhtml-response/expected.html @@ -6,7 +6,9 @@ XHTML 1.0 Strict Example -

Foo

- - +
+

Foo

+
+ + diff --git a/plugins/optimization-detective/tests/test-class-od-element.php b/plugins/optimization-detective/tests/test-class-od-element.php index 52a4cc43ff..743d766a68 100644 --- a/plugins/optimization-detective/tests/test-class-od-element.php +++ b/plugins/optimization-detective/tests/test-class-od-element.php @@ -39,7 +39,7 @@ static function ( array $schema ): array { ); $element_data = array( - 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]', + 'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]', 'isLCP' => false, 'isLCPCandidate' => true, 'intersectionRatio' => 0.123, diff --git a/plugins/optimization-detective/tests/test-class-od-html-tag-processor.php b/plugins/optimization-detective/tests/test-class-od-html-tag-processor.php index 4590d28cb7..920ad53506 100644 --- a/plugins/optimization-detective/tests/test-class-od-html-tag-processor.php +++ b/plugins/optimization-detective/tests/test-class-od-html-tag-processor.php @@ -34,18 +34,20 @@ public function data_provider_sample_documents(): array { - -

- Foo! -
- Foo -

-
- +
+ +

+ Foo! +
+ Foo +

+
+
The end!
+
', - 'open_tags' => array( 'HTML', 'HEAD', 'META', 'TITLE', 'SCRIPT', 'STYLE', 'BODY', 'IFRAME', 'P', 'BR', 'IMG', 'FORM', 'TEXTAREA', 'FOOTER' ), + 'open_tags' => array( 'HTML', 'HEAD', 'META', 'TITLE', 'SCRIPT', 'STYLE', 'BODY', 'DIV', 'IFRAME', 'P', 'BR', 'IMG', 'FORM', 'TEXTAREA', 'FOOTER' ), 'xpath_breadcrumbs' => array( '/*[1][self::HTML]' => array( 'HTML' ), '/*[1][self::HTML]/*[1][self::HEAD]' => array( 'HTML', 'HEAD' ), @@ -54,13 +56,14 @@ public function data_provider_sample_documents(): array { '/*[1][self::HTML]/*[1][self::HEAD]/*[3][self::SCRIPT]' => array( 'HTML', 'HEAD', 'SCRIPT' ), '/*[1][self::HTML]/*[1][self::HEAD]/*[4][self::STYLE]' => array( 'HTML', 'HEAD', 'STYLE' ), '/*[1][self::HTML]/*[2][self::BODY]' => array( 'HTML', 'BODY' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IFRAME]' => array( 'HTML', 'BODY', 'IFRAME' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]' => array( 'HTML', 'BODY', 'P' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]/*[1][self::BR]' => array( 'HTML', 'BODY', 'P', 'BR' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]/*[2][self::IMG]' => array( 'HTML', 'BODY', 'P', 'IMG' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::FORM]' => array( 'HTML', 'BODY', 'FORM' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::FORM]/*[1][self::TEXTAREA]' => array( 'HTML', 'BODY', 'FORM', 'TEXTAREA' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::FOOTER]' => array( 'HTML', 'BODY', 'FOOTER' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IFRAME]' => array( 'HTML', 'BODY', 'DIV', 'IFRAME' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::P]/*[1][self::BR]' => array( 'HTML', 'BODY', 'DIV', 'P', 'BR' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::P]/*[2][self::IMG]' => array( 'HTML', 'BODY', 'DIV', 'P', 'IMG' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::FORM]' => array( 'HTML', 'BODY', 'DIV', 'FORM' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::FORM]/*[1][self::TEXTAREA]' => array( 'HTML', 'BODY', 'DIV', 'FORM', 'TEXTAREA' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::FOOTER]' => array( 'HTML', 'BODY', 'DIV', 'FOOTER' ), ), ), 'foreign-elements' => array( @@ -68,37 +71,40 @@ public function data_provider_sample_documents(): array { - - - - - - - - - - 1 - - 2 - +
+ + + + + + + + + + 1 + + 2 + +
', - 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'SVG', 'G', 'PATH', 'CIRCLE', 'G', 'RECT', 'MATH', 'MN', 'MSPACE', 'MN' ), + 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'DIV', 'SVG', 'G', 'PATH', 'CIRCLE', 'G', 'RECT', 'MATH', 'MN', 'MSPACE', 'MN' ), 'xpath_breadcrumbs' => array( '/*[1][self::HTML]' => array( 'HTML' ), '/*[1][self::HTML]/*[1][self::HEAD]' => array( 'HTML', 'HEAD' ), '/*[1][self::HTML]/*[2][self::BODY]' => array( 'HTML', 'BODY' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]' => array( 'HTML', 'BODY', 'SVG' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]/*[1][self::G]' => array( 'HTML', 'BODY', 'SVG', 'G' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]/*[1][self::G]/*[1][self::PATH]' => array( 'HTML', 'BODY', 'SVG', 'G', 'PATH' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]/*[1][self::G]/*[2][self::CIRCLE]' => array( 'HTML', 'BODY', 'SVG', 'G', 'CIRCLE' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]/*[1][self::G]/*[3][self::G]' => array( 'HTML', 'BODY', 'SVG', 'G', 'G' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SVG]/*[1][self::G]/*[4][self::RECT]' => array( 'HTML', 'BODY', 'SVG', 'G', 'RECT' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MATH]' => array( 'HTML', 'BODY', 'MATH' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MATH]/*[1][self::MN]' => array( 'HTML', 'BODY', 'MATH', 'MN' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MATH]/*[2][self::MSPACE]' => array( 'HTML', 'BODY', 'MATH', 'MSPACE' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::MATH]/*[3][self::MN]' => array( 'HTML', 'BODY', 'MATH', 'MN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]' => array( 'HTML', 'BODY', 'DIV', 'SVG' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]/*[1][self::G]' => array( 'HTML', 'BODY', 'DIV', 'SVG', 'G' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]/*[1][self::G]/*[1][self::PATH]' => array( 'HTML', 'BODY', 'DIV', 'SVG', 'G', 'PATH' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]/*[1][self::G]/*[2][self::CIRCLE]' => array( 'HTML', 'BODY', 'DIV', 'SVG', 'G', 'CIRCLE' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]/*[1][self::G]/*[3][self::G]' => array( 'HTML', 'BODY', 'DIV', 'SVG', 'G', 'G' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SVG]/*[1][self::G]/*[4][self::RECT]' => array( 'HTML', 'BODY', 'DIV', 'SVG', 'G', 'RECT' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MATH]' => array( 'HTML', 'BODY', 'DIV', 'MATH' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MATH]/*[1][self::MN]' => array( 'HTML', 'BODY', 'DIV', 'MATH', 'MN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MATH]/*[2][self::MSPACE]' => array( 'HTML', 'BODY', 'DIV', 'MATH', 'MSPACE' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::MATH]/*[3][self::MN]' => array( 'HTML', 'BODY', 'DIV', 'MATH', 'MN' ), ), ), 'closing-void-tag' => array( @@ -106,20 +112,23 @@ public function data_provider_sample_documents(): array { - 1 - - 2 +
+ 1 + + 2 +
', - 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'SPAN', 'META', 'SPAN' ), + 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'DIV', 'SPAN', 'META', 'SPAN' ), 'xpath_breadcrumbs' => array( '/*[1][self::HTML]' => array( 'HTML' ), '/*[1][self::HTML]/*[1][self::HEAD]' => array( 'HTML', 'HEAD' ), '/*[1][self::HTML]/*[2][self::BODY]' => array( 'HTML', 'BODY' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::SPAN]' => array( 'HTML', 'BODY', 'SPAN' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::META]' => array( 'HTML', 'BODY', 'META' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::SPAN]' => array( 'HTML', 'BODY', 'SPAN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::SPAN]' => array( 'HTML', 'BODY', 'DIV', 'SPAN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::META]' => array( 'HTML', 'BODY', 'DIV', 'META' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::SPAN]' => array( 'HTML', 'BODY', 'DIV', 'SPAN' ), ), ), 'void-tags' => array( @@ -127,58 +136,61 @@ public function data_provider_sample_documents(): array { - - - - -
- - - -
- - - - - - - - - +
+ + + + +
+ + + +
+ + + + + + + + + - -
- - + +
+ + +
', - 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'AREA', 'BASE', 'BASEFONT', 'BGSOUND', 'BR', 'COL', 'EMBED', 'FRAME', 'HR', 'IMG', 'INPUT', 'KEYGEN', 'LINK', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR', 'DIV', 'SPAN', 'EM' ), + 'open_tags' => array( 'HTML', 'HEAD', 'BODY', 'DIV', 'AREA', 'BASE', 'BASEFONT', 'BGSOUND', 'BR', 'COL', 'EMBED', 'FRAME', 'HR', 'IMG', 'INPUT', 'KEYGEN', 'LINK', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR', 'DIV', 'SPAN', 'EM' ), 'xpath_breadcrumbs' => array( '/*[1][self::HTML]' => array( 'HTML' ), '/*[1][self::HTML]/*[1][self::HEAD]' => array( 'HTML', 'HEAD' ), '/*[1][self::HTML]/*[2][self::BODY]' => array( 'HTML', 'BODY' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::AREA]' => array( 'HTML', 'BODY', 'AREA' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::BASE]' => array( 'HTML', 'BODY', 'BASE' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::BASEFONT]' => array( 'HTML', 'BODY', 'BASEFONT' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::BGSOUND]' => array( 'HTML', 'BODY', 'BGSOUND' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::BR]' => array( 'HTML', 'BODY', 'BR' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[6][self::COL]' => array( 'HTML', 'BODY', 'COL' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[7][self::EMBED]' => array( 'HTML', 'BODY', 'EMBED' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[8][self::FRAME]' => array( 'HTML', 'BODY', 'FRAME' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[9][self::HR]' => array( 'HTML', 'BODY', 'HR' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[10][self::IMG]' => array( 'HTML', 'BODY', 'IMG' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[11][self::INPUT]' => array( 'HTML', 'BODY', 'INPUT' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[12][self::KEYGEN]' => array( 'HTML', 'BODY', 'KEYGEN' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[13][self::LINK]' => array( 'HTML', 'BODY', 'LINK' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[14][self::META]' => array( 'HTML', 'BODY', 'META' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[15][self::PARAM]' => array( 'HTML', 'BODY', 'PARAM' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[16][self::SOURCE]' => array( 'HTML', 'BODY', 'SOURCE' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[17][self::TRACK]' => array( 'HTML', 'BODY', 'TRACK' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[18][self::WBR]' => array( 'HTML', 'BODY', 'WBR' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[19][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[19][self::DIV]/*[1][self::SPAN]' => array( 'HTML', 'BODY', 'DIV', 'SPAN' ), - '/*[1][self::HTML]/*[2][self::BODY]/*[19][self::DIV]/*[1][self::SPAN]/*[1][self::EM]' => array( 'HTML', 'BODY', 'DIV', 'SPAN', 'EM' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::AREA]' => array( 'HTML', 'BODY', 'DIV', 'AREA' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::BASE]' => array( 'HTML', 'BODY', 'DIV', 'BASE' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::BASEFONT]' => array( 'HTML', 'BODY', 'DIV', 'BASEFONT' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::BGSOUND]' => array( 'HTML', 'BODY', 'DIV', 'BGSOUND' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[5][self::BR]' => array( 'HTML', 'BODY', 'DIV', 'BR' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[6][self::COL]' => array( 'HTML', 'BODY', 'DIV', 'COL' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[7][self::EMBED]' => array( 'HTML', 'BODY', 'DIV', 'EMBED' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[8][self::FRAME]' => array( 'HTML', 'BODY', 'DIV', 'FRAME' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[9][self::HR]' => array( 'HTML', 'BODY', 'DIV', 'HR' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[10][self::IMG]' => array( 'HTML', 'BODY', 'DIV', 'IMG' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[11][self::INPUT]' => array( 'HTML', 'BODY', 'DIV', 'INPUT' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[12][self::KEYGEN]' => array( 'HTML', 'BODY', 'DIV', 'KEYGEN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[13][self::LINK]' => array( 'HTML', 'BODY', 'DIV', 'LINK' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[14][self::META]' => array( 'HTML', 'BODY', 'DIV', 'META' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[15][self::PARAM]' => array( 'HTML', 'BODY', 'DIV', 'PARAM' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[16][self::SOURCE]' => array( 'HTML', 'BODY', 'DIV', 'SOURCE' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[17][self::TRACK]' => array( 'HTML', 'BODY', 'DIV', 'TRACK' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[18][self::WBR]' => array( 'HTML', 'BODY', 'DIV', 'WBR' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[19][self::DIV]' => array( 'HTML', 'BODY', 'DIV', 'DIV' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[19][self::DIV]/*[1][self::SPAN]' => array( 'HTML', 'BODY', 'DIV', 'DIV', 'SPAN' ), + '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[19][self::DIV]/*[1][self::SPAN]/*[1][self::EM]' => array( 'HTML', 'BODY', 'DIV', 'DIV', 'SPAN', 'EM' ), ), ), 'optional-closing-p' => array( @@ -186,114 +198,117 @@ public function data_provider_sample_documents(): array { - -

First -

Second -

Third +

+ +

First +

Second +

Third - -

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

    - 

    
-							
    
-							
    
-							
    
-							
      
+								
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
      
+								
        
+								
        
+								
        
+								
        
+								
        
+								
          
+							
          
 						
 					
 				',
-				'open_tags'         => array( 'HTML', 'HEAD', 'BODY', 'P', 'P', 'EM', 'P', 'P', 'ADDRESS', 'P', 'ARTICLE', 'P', 'ASIDE', 'P', 'BLOCKQUOTE', 'P', 'DETAILS', 'P', 'DIV', 'P', 'DL', 'P', 'FIELDSET', 'P', 'FIGCAPTION', 'P', 'FIGURE', 'P', 'FOOTER', 'P', 'FORM', 'P', 'H1', 'P', 'H2', 'P', 'H3', 'P', 'H4', 'P', 'H5', 'P', 'H6', 'P', 'HEADER', 'P', 'HGROUP', 'P', 'HR', 'P', 'MAIN', 'P', 'MENU', 'P', 'NAV', 'P', 'OL', 'P', 'PRE', 'P', 'SEARCH', 'P', 'SECTION', 'P', 'TABLE', 'P', 'UL' ),
+				'open_tags'         => array( 'HTML', 'HEAD', 'BODY', 'DIV', 'P', 'P', 'EM', 'P', 'P', 'ADDRESS', 'P', 'ARTICLE', 'P', 'ASIDE', 'P', 'BLOCKQUOTE', 'P', 'DETAILS', 'P', 'DIV', 'P', 'DL', 'P', 'FIELDSET', 'P', 'FIGCAPTION', 'P', 'FIGURE', 'P', 'FOOTER', 'P', 'FORM', 'P', 'H1', 'P', 'H2', 'P', 'H3', 'P', 'H4', 'P', 'H5', 'P', 'H6', 'P', 'HEADER', 'P', 'HGROUP', 'P', 'HR', 'P', 'MAIN', 'P', 'MENU', 'P', 'NAV', 'P', 'OL', 'P', 'PRE', 'P', 'SEARCH', 'P', 'SECTION', 'P', 'TABLE', 'P', 'UL' ),
 				'xpath_breadcrumbs' => array(
 					'/*[1][self::HTML]'                  => array( 'HTML' ),
 					'/*[1][self::HTML]/*[1][self::HEAD]' => array( 'HTML', 'HEAD' ),
 					'/*[1][self::HTML]/*[2][self::BODY]' => array( 'HTML', 'BODY' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]/*[1][self::EM]' => array( 'HTML', 'BODY', 'P', 'EM' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[3][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[4][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[5][self::ADDRESS]' => array( 'HTML', 'BODY', 'ADDRESS' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[6][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[7][self::ARTICLE]' => array( 'HTML', 'BODY', 'ARTICLE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[8][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[9][self::ASIDE]' => array( 'HTML', 'BODY', 'ASIDE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[10][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[11][self::BLOCKQUOTE]' => array( 'HTML', 'BODY', 'BLOCKQUOTE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[12][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[13][self::DETAILS]' => array( 'HTML', 'BODY', 'DETAILS' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[14][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[15][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[16][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[17][self::DL]' => array( 'HTML', 'BODY', 'DL' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[18][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[19][self::FIELDSET]' => array( 'HTML', 'BODY', 'FIELDSET' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[20][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[21][self::FIGCAPTION]' => array( 'HTML', 'BODY', 'FIGCAPTION' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[22][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[23][self::FIGURE]' => array( 'HTML', 'BODY', 'FIGURE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[24][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[25][self::FOOTER]' => array( 'HTML', 'BODY', 'FOOTER' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[26][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[27][self::FORM]' => array( 'HTML', 'BODY', 'FORM' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[28][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[29][self::H1]' => array( 'HTML', 'BODY', 'H1' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[30][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[31][self::H2]' => array( 'HTML', 'BODY', 'H2' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[32][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[33][self::H3]' => array( 'HTML', 'BODY', 'H3' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[34][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[35][self::H4]' => array( 'HTML', 'BODY', 'H4' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[36][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[37][self::H5]' => array( 'HTML', 'BODY', 'H5' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[38][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[39][self::H6]' => array( 'HTML', 'BODY', 'H6' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[40][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[41][self::HEADER]' => array( 'HTML', 'BODY', 'HEADER' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[42][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[43][self::HGROUP]' => array( 'HTML', 'BODY', 'HGROUP' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[44][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[45][self::HR]' => array( 'HTML', 'BODY', 'HR' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[46][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[47][self::MAIN]' => array( 'HTML', 'BODY', 'MAIN' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[48][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[49][self::MENU]' => array( 'HTML', 'BODY', 'MENU' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[50][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[51][self::NAV]' => array( 'HTML', 'BODY', 'NAV' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[52][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[53][self::OL]' => array( 'HTML', 'BODY', 'OL' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[54][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[55][self::PRE]' => array( 'HTML', 'BODY', 'PRE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[56][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[57][self::SEARCH]' => array( 'HTML', 'BODY', 'SEARCH' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[58][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[59][self::SECTION]' => array( 'HTML', 'BODY', 'SECTION' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[60][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[61][self::TABLE]' => array( 'HTML', 'BODY', 'TABLE' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[62][self::P]' => array( 'HTML', 'BODY', 'P' ),
-					'/*[1][self::HTML]/*[2][self::BODY]/*[63][self::UL]' => array( 'HTML', 'BODY', 'UL' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]' => array( 'HTML', 'BODY', 'DIV' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::P]/*[1][self::EM]' => array( 'HTML', 'BODY', 'DIV', 'P', 'EM' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[4][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[5][self::ADDRESS]' => array( 'HTML', 'BODY', 'DIV', 'ADDRESS' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[6][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[7][self::ARTICLE]' => array( 'HTML', 'BODY', 'DIV', 'ARTICLE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[8][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[9][self::ASIDE]' => array( 'HTML', 'BODY', 'DIV', 'ASIDE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[10][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[11][self::BLOCKQUOTE]' => array( 'HTML', 'BODY', 'DIV', 'BLOCKQUOTE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[12][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[13][self::DETAILS]' => array( 'HTML', 'BODY', 'DIV', 'DETAILS' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[14][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[15][self::DIV]' => array( 'HTML', 'BODY', 'DIV', 'DIV' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[16][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[17][self::DL]' => array( 'HTML', 'BODY', 'DIV', 'DL' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[18][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[19][self::FIELDSET]' => array( 'HTML', 'BODY', 'DIV', 'FIELDSET' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[20][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[21][self::FIGCAPTION]' => array( 'HTML', 'BODY', 'DIV', 'FIGCAPTION' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[22][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[23][self::FIGURE]' => array( 'HTML', 'BODY', 'DIV', 'FIGURE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[24][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[25][self::FOOTER]' => array( 'HTML', 'BODY', 'DIV', 'FOOTER' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[26][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[27][self::FORM]' => array( 'HTML', 'BODY', 'DIV', 'FORM' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[28][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[29][self::H1]' => array( 'HTML', 'BODY', 'DIV', 'H1' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[30][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[31][self::H2]' => array( 'HTML', 'BODY', 'DIV', 'H2' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[32][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[33][self::H3]' => array( 'HTML', 'BODY', 'DIV', 'H3' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[34][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[35][self::H4]' => array( 'HTML', 'BODY', 'DIV', 'H4' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[36][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[37][self::H5]' => array( 'HTML', 'BODY', 'DIV', 'H5' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[38][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[39][self::H6]' => array( 'HTML', 'BODY', 'DIV', 'H6' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[40][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[41][self::HEADER]' => array( 'HTML', 'BODY', 'DIV', 'HEADER' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[42][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[43][self::HGROUP]' => array( 'HTML', 'BODY', 'DIV', 'HGROUP' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[44][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[45][self::HR]' => array( 'HTML', 'BODY', 'DIV', 'HR' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[46][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[47][self::MAIN]' => array( 'HTML', 'BODY', 'DIV', 'MAIN' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[48][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[49][self::MENU]' => array( 'HTML', 'BODY', 'DIV', 'MENU' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[50][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[51][self::NAV]' => array( 'HTML', 'BODY', 'DIV', 'NAV' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[52][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[53][self::OL]' => array( 'HTML', 'BODY', 'DIV', 'OL' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[54][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[55][self::PRE]' => array( 'HTML', 'BODY', 'DIV', 'PRE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[56][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[57][self::SEARCH]' => array( 'HTML', 'BODY', 'DIV', 'SEARCH' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[58][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[59][self::SECTION]' => array( 'HTML', 'BODY', 'DIV', 'SECTION' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[60][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[61][self::TABLE]' => array( 'HTML', 'BODY', 'DIV', 'TABLE' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[62][self::P]' => array( 'HTML', 'BODY', 'DIV', 'P' ),
+					'/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[63][self::UL]' => array( 'HTML', 'BODY', 'DIV', 'UL' ),
 				),
 			),
 		);
@@ -459,15 +474,17 @@ public function test_bookmarking_and_seeking(): void {
 				
 					
 					
-						
-						
          
-							
          
-								
-							
          
-							
          This is the State of the Word!
          
-						
          
-						
-						
+						
          
+							
+							
          
+								
          
+									
+								
          
+								
          This is the State of the Word!
          
+							
          
+							
+							
+						
          
 					
 				
 				'
@@ -510,23 +527,23 @@ public function test_bookmarking_and_seeking(): void {
 		$expected_figure_contents = array(
 			array(
 				'tag'   => 'FIGURE',
-				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]',
-				'depth' => 3,
+				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]',
+				'depth' => 4,
 			),
 			array(
 				'tag'   => 'DIV',
-				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]/*[1][self::DIV]',
-				'depth' => 4,
+				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]/*[1][self::DIV]',
+				'depth' => 5,
 			),
 			array(
 				'tag'   => 'IFRAME',
-				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]/*[1][self::DIV]/*[1][self::IFRAME]',
-				'depth' => 5,
+				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]/*[1][self::DIV]/*[1][self::IFRAME]',
+				'depth' => 6,
 			),
 			array(
 				'tag'   => 'FIGCAPTION',
-				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::FIGURE]/*[2][self::FIGCAPTION]',
-				'depth' => 4,
+				'xpath' => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::FIGURE]/*[2][self::FIGCAPTION]',
+				'depth' => 5,
 			),
 		);
 
diff --git a/plugins/optimization-detective/tests/test-class-od-url-metric.php b/plugins/optimization-detective/tests/test-class-od-url-metric.php
index 51b23c243e..744cb19c9c 100644
--- a/plugins/optimization-detective/tests/test-class-od-url-metric.php
+++ b/plugins/optimization-detective/tests/test-class-od-url-metric.php
@@ -22,7 +22,7 @@ public function data_provider_to_test_constructor(): array {
 		$valid_element = array(
 			'isLCP'              => true,
 			'isLCPCandidate'     => true,
-			'xpath'              => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]',
+			'xpath'              => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]',
 			'intersectionRatio'  => 1.0,
 			'intersectionRect'   => $this->get_sample_dom_rect(),
 			'boundingClientRect' => $this->get_sample_dom_rect(),
@@ -359,7 +359,7 @@ public function data_provider_to_test_constructor_with_extended_schema(): array
 		$valid_element = array(
 			'isLCP'              => true,
 			'isLCPCandidate'     => true,
-			'xpath'              => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]',
+			'xpath'              => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]',
 			'intersectionRatio'  => 1.0,
 			'intersectionRect'   => $this->get_sample_dom_rect(),
 			'boundingClientRect' => $this->get_sample_dom_rect(),
diff --git a/plugins/optimization-detective/tests/test-class-od-url-metrics-group-collection.php b/plugins/optimization-detective/tests/test-class-od-url-metrics-group-collection.php
index ef05fc2ab4..ae2fe89a04 100644
--- a/plugins/optimization-detective/tests/test-class-od-url-metrics-group-collection.php
+++ b/plugins/optimization-detective/tests/test-class-od-url-metrics-group-collection.php
@@ -702,9 +702,9 @@ public function test_is_every_group_populated(): void {
 	 */
 	public function test_get_groups_by_lcp_element(): void {
 
-		$first_child_image_xpath  = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]';
-		$second_child_image_xpath = '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]';
-		$first_child_h1_xpath     = '/*[1][self::HTML]/*21][self::BODY]/*[1][self::H1]';
+		$first_child_image_xpath  = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]';
+		$second_child_image_xpath = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]';
+		$first_child_h1_xpath     = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::H1]';
 
 		$get_url_metric_with_one_lcp_element = function ( int $viewport_width, string $lcp_element_xpath ): OD_URL_Metric {
 			return $this->get_sample_url_metric(
@@ -761,8 +761,8 @@ public function test_get_groups_by_lcp_element(): void {
 	 * @return array
 	 */
 	public function data_provider_test_get_common_lcp_element(): array {
-		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[1]';
-		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[2]';
+		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]';
+		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]';
 
 		$get_sample_url_metric = function ( int $viewport_width, string $lcp_element_xpath, bool $is_lcp = true ): OD_URL_Metric {
 			return $this->get_sample_url_metric(
@@ -876,9 +876,9 @@ public function test_get_common_lcp_element( array $url_metrics, ?string $expect
 	 * @return array
 	 */
 	public function data_provider_element_max_intersection_ratios(): array {
-		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[1]';
-		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[2]';
-		$xpath3 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[3]';
+		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]';
+		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]';
+		$xpath3 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]';
 
 		$get_sample_url_metric = function ( int $viewport_width, string $lcp_element_xpath, float $intersection_ratio ): OD_URL_Metric {
 			return $this->get_sample_url_metric(
@@ -962,7 +962,7 @@ public function test_get_all_element_max_intersection_ratios( array $url_metrics
 			$this->assertSame( $expected_max_ratio, $group_collection->get_element_max_intersection_ratio( $expected_xpath ) );
 		}
 
-		$this->assertNull( $group_collection->get_element_max_intersection_ratio( '/*[0][self::HTML]/*[1][self::BODY]/*[0][self::BLINK]/*[1]' ) );
+		$this->assertNull( $group_collection->get_element_max_intersection_ratio( '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::BLINK]' ) );
 
 		// Check get_all_denormalized_elements.
 		$all_elements = $group_collection->get_xpath_elements_map();
@@ -991,9 +991,9 @@ public function test_get_all_element_max_intersection_ratios( array $url_metrics
 	 * @return array
 	 */
 	public function data_provider_element_minimum_heights(): array {
-		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[1]';
-		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[2]';
-		$xpath3 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::IMG]/*[3]';
+		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]';
+		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]';
+		$xpath3 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[3][self::IMG]';
 
 		$get_sample_url_metric = function ( int $viewport_width, string $lcp_element_xpath, float $element_height ): OD_URL_Metric {
 			return $this->get_sample_url_metric(
@@ -1059,8 +1059,8 @@ public function data_provider_element_minimum_heights(): array {
 	 * @return array
 	 */
 	public function data_provider_get_all_elements_positioned_in_any_initial_viewport(): array {
-		$xpath1 = '/*[0][self::HTML]/*[1][self::BODY]/*[0][self::IMG]/*[1]';
-		$xpath2 = '/*[0][self::HTML]/*[1][self::BODY]/*[0][self::IMG]/*[2]';
+		$xpath1 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::IMG]';
+		$xpath2 = '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[2][self::IMG]';
 
 		$get_sample_url_metric = function ( int $viewport_width, int $viewport_height, string $xpath, float $intersection_ratio, float $top ): OD_URL_Metric {
 			return $this->get_sample_url_metric(
@@ -1139,7 +1139,7 @@ public function test_get_all_elements_positioned_in_any_initial_viewport( array
 		foreach ( $expected as $expected_xpath => $expected_is_positioned ) {
 			$this->assertSame( $expected_is_positioned, $group_collection->is_element_positioned_in_any_initial_viewport( $expected_xpath ) );
 		}
-		$this->assertNull( $group_collection->is_element_positioned_in_any_initial_viewport( '/*[0][self::HTML]/*[1][self::BODY]/*[0][self::BLINK]/*[1]' ) );
+		$this->assertNull( $group_collection->is_element_positioned_in_any_initial_viewport( '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::DIV]/*[1][self::BLINK]' ) );
 	}
 
 	/**