Issue #3376263 by Spokje: Tighten xpath selectors to decrease complexity in tests

(cherry picked from commit c8deebc1)

core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php

@@ -88,19 +88,15 @@ protected function doTestAggregation(array $settings): void {
 
     // Collect all the URLs for all the script and styles prior to making any
     // more requests.
-    $style_elements = $page->findAll('xpath', '//link[@rel="stylesheet"]');
-    $script_elements = $page->findAll('xpath', '//script');
+    $style_elements = $page->findAll('xpath', '//link[@href and @rel="stylesheet"]');
+    $script_elements = $page->findAll('xpath', '//script[@src]');
     $style_urls = [];
     foreach ($style_elements as $element) {
-      if ($element->hasAttribute('href')) {
-        $style_urls[] = $element->getAttribute('href');
-      }
+      $style_urls[] = $element->getAttribute('href');
     }
     $script_urls = [];
     foreach ($script_elements as $element) {
-      if ($element->hasAttribute('src')) {
-        $script_urls[] = $element->getAttribute('src');
-      }
+      $script_urls[] = $element->getAttribute('src');
     }
     foreach ($style_urls as $url) {
       $this->assertAggregate($url);

core/tests/Drupal/FunctionalTests/Asset/UnversionedAssetTest.php

@@ -50,24 +50,22 @@ public function testUnversionedAssets(): void {
     $session = $this->getSession();
     $page = $session->getPage();
 
-    $style_elements = $page->findAll('xpath', '//link[@rel="stylesheet"]');
+    $style_elements = $page->findAll('xpath', '//link[@href and @rel="stylesheet"]');
     $this->assertNotEmpty($style_elements);
     $href = NULL;
     foreach ($style_elements as $element) {
-      if ($element->hasAttribute('href')) {
-        $href = $element->getAttribute('href');
-        $url = $this->getAbsoluteUrl($href);
-        // Not every script or style on a page is aggregated.
-        if (!str_contains($url, $this->fileAssetsPath)) {
-          continue;
-        }
-        $session = $this->getSession();
-        $session->visit($url);
-        $this->assertSession()->statusCodeEquals(200);
-        $aggregate = $session = $session->getPage()->getContent();
-        $this->assertStringContainsString('original-content', $aggregate);
-        $this->assertStringNotContainsString('extra-stuff', $aggregate);
+      $href = $element->getAttribute('href');
+      $url = $this->getAbsoluteUrl($href);
+      // Not every script or style on a page is aggregated.
+      if (!str_contains($url, $this->fileAssetsPath)) {
+        continue;
       }
+      $session = $this->getSession();
+      $session->visit($url);
+      $this->assertSession()->statusCodeEquals(200);
+      $aggregate = $session = $session->getPage()->getContent();
+      $this->assertStringContainsString('original-content', $aggregate);
+      $this->assertStringNotContainsString('extra-stuff', $aggregate);
     }
     $file = file_get_contents('public://test.css') . '.extra-stuff{display:none;}';
     file_put_contents('public://test.css', $file);
@@ -78,24 +76,22 @@ public function testUnversionedAssets(): void {
     $this->drupalGet('<front>');
     $session = $this->getSession();
     $page = $session->getPage();
-    $style_elements = $page->findAll('xpath', '//link[@rel="stylesheet"]');
+    $style_elements = $page->findAll('xpath', '//link[@href and @rel="stylesheet"]');
     $this->assertNotEmpty($style_elements);
     foreach ($style_elements as $element) {
-      if ($element->hasAttribute('href')) {
-        $new_href = $element->getAttribute('href');
-        $this->assertNotSame($new_href, $href);
-        $url = $this->getAbsoluteUrl($new_href);
-        // Not every script or style on a page is aggregated.
-        if (!str_contains($url, $this->fileAssetsPath)) {
-          continue;
-        }
-        $session = $this->getSession();
-        $session->visit($url);
-        $this->assertSession()->statusCodeEquals(200);
-        $aggregate = $session = $session->getPage()->getContent();
-        $this->assertStringContainsString('original-content', $aggregate);
-        $this->assertStringContainsString('extra-stuff', $aggregate);
+      $new_href = $element->getAttribute('href');
+      $this->assertNotSame($new_href, $href);
+      $url = $this->getAbsoluteUrl($new_href);
+      // Not every script or style on a page is aggregated.
+      if (!str_contains($url, $this->fileAssetsPath)) {
+        continue;
       }
+      $session = $this->getSession();
+      $session->visit($url);
+      $this->assertSession()->statusCodeEquals(200);
+      $aggregate = $session = $session->getPage()->getContent();
+      $this->assertStringContainsString('original-content', $aggregate);
+      $this->assertStringContainsString('extra-stuff', $aggregate);
     }
   }