diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockSystemBrandingTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockSystemBrandingTest.php index 6cf3321..9c34670 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockSystemBrandingTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockSystemBrandingTest.php @@ -8,7 +8,7 @@ namespace Drupal\block\Tests; /** - * Tests site branding block. + * Provides testing for the branding block module functionality. */ class BlockSystemBrandingTest extends BlockTestBase { @@ -44,11 +44,9 @@ function testSystemBrandingSettings() { // Set default block settings and test that all branding elements are displayed. $this->drupalGet(''); $site_logo_element = $this->xpath('//div[@id="block-site-branding"]//a[@class="site-logo"]'); - $site_name_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="name-and-slogan"]'); $site_name_element = $this->xpath('//div[@id="block-site-branding"]//strong[@class="site-name"]'); $site_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="site-slogan"]'); $this->assertTrue(!empty($site_logo_element), 'The branding block logo was found.'); - $this->assertTrue(!empty($site_name_slogan_element), 'The branding block name and slogan div was found.'); $this->assertTrue(!empty($site_name_element), 'The branding block site name was found.'); $this->assertTrue(!empty($site_slogan_element), 'The branding block slogan was found.'); @@ -58,11 +56,9 @@ function testSystemBrandingSettings() { ->save(); $this->drupalGet(''); $site_logo_element = $this->xpath('//div[@id="block-site-branding"]//a[@class="site-logo"]'); - $site_name_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="name-and-slogan"]'); $site_name_element = $this->xpath('//div[@id="block-site-branding"]//strong[@class="site-name"]'); $site_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="site-slogan"]'); $this->assertTrue(empty($site_logo_element), 'The branding block logo was disabled.'); - $this->assertTrue(!empty($site_name_slogan_element), 'The branding block name and slogan div was found.'); $this->assertTrue(!empty($site_name_element), 'The branding block site name was found.'); $this->assertTrue(!empty($site_slogan_element), 'The branding block slogan was found.'); @@ -73,11 +69,9 @@ function testSystemBrandingSettings() { ->save(); $this->drupalGet(''); $site_logo_element = $this->xpath('//div[@id="block-site-branding"]//a[@class="site-logo"]'); - $site_name_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="name-and-slogan"]'); $site_name_element = $this->xpath('//div[@id="block-site-branding"]//strong[@class="site-name"]'); $site_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="site-slogan"]'); $this->assertTrue(!empty($site_logo_element), 'The branding block logo was found.'); - $this->assertTrue(!empty($site_name_slogan_element), 'The branding block name and slogan div was found.'); $this->assertTrue(empty($site_name_element), 'The branding block site name was disabled.'); $this->assertTrue(!empty($site_slogan_element), 'The branding block slogan was found.'); @@ -88,11 +82,9 @@ function testSystemBrandingSettings() { ->save(); $this->drupalGet(''); $site_logo_element = $this->xpath('//div[@id="block-site-branding"]//a[@class="site-logo"]'); - $site_name_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="name-and-slogan"]'); $site_name_element = $this->xpath('//div[@id="block-site-branding"]//strong[@class="site-name"]'); $site_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="site-slogan"]'); $this->assertTrue(!empty($site_logo_element), 'The branding block logo was found.'); - $this->assertTrue(!empty($site_name_slogan_element), 'The branding block name and slogan div was found.'); $this->assertTrue(!empty($site_name_element), 'The branding block site name was found.'); $this->assertTrue(empty($site_slogan_element), 'The branding block slogan was disabled.'); @@ -103,11 +95,9 @@ function testSystemBrandingSettings() { ->save(); $this->drupalGet(''); $site_logo_element = $this->xpath('//div[@id="block-site-branding"]//a[@class="site-logo"]'); - $site_name_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="name-and-slogan"]'); $site_name_element = $this->xpath('//div[@id="block-site-branding"]//strong[@class="site-name"]'); $site_slogan_element = $this->xpath('//div[@id="block-site-branding"]//div[@class="site-slogan"]'); $this->assertTrue(!empty($site_logo_element), 'The branding block logo was found.'); - $this->assertTrue(empty($site_name_slogan_element), 'The branding block name and slogan div was disabled.'); $this->assertTrue(empty($site_name_element), 'The branding block site name was disabled.'); $this->assertTrue(empty($site_slogan_element), 'The branding block slogan was disabled.'); }