diff --git a/core/modules/color/tests/src/Functional/ColorTest.php b/core/modules/color/tests/src/Functional/ColorTest.php index 7ea8ace..bb7d6fa 100644 --- a/core/modules/color/tests/src/Functional/ColorTest.php +++ b/core/modules/color/tests/src/Functional/ColorTest.php @@ -118,7 +118,7 @@ function _testColor($theme, $test_values) { foreach ($stylesheets as $stylesheet) { $this->assertSession()->responseMatches('|' . file_url_transform_relative(file_create_url($stylesheet)) . '|'); $stylesheet_content = join("\n", file($stylesheet)); - $this->assertTrue(strpos($stylesheet_content, 'color: #123456') !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')'); + $this->assertTrue(strpos($stylesheet_content, 'color: #123456') !== FALSE); } $this->drupalGet($settings_path); @@ -130,7 +130,7 @@ function _testColor($theme, $test_values) { $stylesheets = $this->config('color.theme.' . $theme)->get('stylesheets'); foreach ($stylesheets as $stylesheet) { $stylesheet_content = join("\n", file($stylesheet)); - $this->assertTrue(strpos($stylesheet_content, 'color: ' . $test_values['scheme_color']) !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')'); + $this->assertTrue(strpos($stylesheet_content, 'color: ' . $test_values['scheme_color']) !== FALSE); } // Test with aggregated CSS turned on. @@ -143,7 +143,7 @@ function _testColor($theme, $test_values) { foreach ($stylesheets as $uri) { $stylesheet_content .= join("\n", file(drupal_realpath($uri))); } - $this->assertTrue(strpos($stylesheet_content, 'public://') === FALSE, 'Make sure the color paths have been translated to local paths. (' . $theme . ')'); + $this->assertTrue(strpos($stylesheet_content, 'public://') === FALSE); $config->set('css.preprocess', 0); $config->save(); } @@ -202,8 +202,8 @@ function testOverrideAndResetScheme() { $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']); $this->drupalGet(''); - $this->assertNoRaw('files/color/bartik-', 'Make sure the color logo is not being used.'); - $this->assertRaw('bartik/logo.svg', 'Make sure the original bartik logo exists.'); + $this->assertNoRaw('files/color/bartik-'); + $this->assertRaw('bartik/logo.svg'); // Log in and set the color scheme to 'slate'. $this->drupalLogin($this->bigUser); @@ -213,8 +213,8 @@ function testOverrideAndResetScheme() { // Visit the homepage and ensure color changes. $this->drupalLogout(); $this->drupalGet(''); - $this->assertRaw('files/color/bartik-', 'Make sure the color logo is being used.'); - $this->assertNoRaw('bartik/logo.svg', 'Make sure the original bartik logo does not exist.'); + $this->assertRaw('files/color/bartik-'); + $this->assertNoRaw('bartik/logo.svg'); // Log in and set the color scheme back to default (delete config). $this->drupalLogin($this->bigUser); @@ -224,8 +224,8 @@ function testOverrideAndResetScheme() { // Log out and ensure there is no color and we have the original logo. $this->drupalLogout(); $this->drupalGet(''); - $this->assertNoRaw('files/color/bartik-', 'Make sure the color logo is not being used.'); - $this->assertRaw('bartik/logo.svg', 'Make sure the original bartik logo exists.'); + $this->assertNoRaw('files/color/bartik-'); + $this->assertRaw('bartik/logo.svg'); } }