diff --git a/core/modules/system/css/components/admin-panel.css b/core/modules/system/css/components/admin-panel.css index c9d38e8b..cdadc58 100644 --- a/core/modules/system/css/components/admin-panel.css +++ b/core/modules/system/css/components/admin-panel.css @@ -10,4 +10,4 @@ .admin-panel .description { margin: 0 0 3px; padding: 2px 0 3px 0; -} \ No newline at end of file +} diff --git a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php index aeb8846..80633ee 100644 --- a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php +++ b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php @@ -73,19 +73,19 @@ function testStylesheets() { $this->drupalGet('theme-test/info/stylesheets'); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$base/base-add.css')]")), "$base/base-add.css found"); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$base/base-override.css')]")), "$base/base-override.css found"); - $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'base-remove.css')]")), "base-remove.css not found"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/base-add.css"))), "$base/base-add.css found"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/base-override.css"))), "$base/base-override.css found"); + $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => 'base-remove.css'))), 'base-remove.css not found'); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/sub-add.css')]")), "$sub/sub-add.css found"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/sub-add.css"))), "$sub/sub-add.css"); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/sub-override.css')]")), "$sub/sub-override.css found"); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/base-add.sub-override.css')]")), "$sub/base-add.sub-override.css found"); - $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/base-remove.sub-override.css')]")), "$sub/base-remove.sub-override.css found"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/sub-override.css"))), "$sub/sub-override.css"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/base-add.sub-override.css"))), "$sub/base-add.sub-override.css"); + $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/base-remove.sub-override.css"))), "$sub/base-remove.sub-override.css"); - $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'sub-remove.css')]")), "sub-remove.css not found"); - $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'base-add.sub-remove.css')]")), "base-add.sub-remove.css not found"); - $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'base-override.sub-remove.css')]")), "base-override.sub-remove.css not found"); + $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => 'sub-remove.css'))), 'sub-remove.css not found'); + $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => 'base-add.sub-remove.css'))), 'base-add.sub-remove.css not found'); + $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => 'base-override.sub-remove.css'))), 'base-override.sub-remove.css not found'); } /**