diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php index d34f06e..ebaa303 100644 --- a/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php +++ b/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php @@ -26,7 +26,7 @@ class ColorConfigSchemaTest extends ConfigSchemaTestBase { * * @var \Drupal\user\UserInterface */ - protected $big_user; + protected $adminUser; public static function getInfo() { return array( @@ -44,8 +44,8 @@ function setUp() { \Drupal::service('theme_handler')->enable(array('bartik')); // Create user. - $this->big_user = $this->drupalCreateUser(array('administer themes')); - $this->drupalLogin($this->big_user); + $this->adminUser = $this->drupalCreateUser(array('administer themes')); + $this->drupalLogin($this->adminUser); } /** diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php index a3e1c08..970097d 100644 --- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php +++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php @@ -136,7 +136,7 @@ function _testColor($theme, $test_values) { $this->drupalPostForm($settings_path, $edit, t('Save configuration')); $this->drupalGet(''); - $stylesheets = \Drupal::config('color.theme' . $theme)->get('stylesheets'); + $stylesheets = \Drupal::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 . ')'); diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTestBase.php b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTestBase.php index 13e9c49..61eee7e 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTestBase.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTestBase.php @@ -19,7 +19,7 @@ use Drupal\simpletest\WebTestBase; /** - * Tests default configuration availability and type with configuration schema. + * Provides a base class to help test configuration schema. */ abstract class ConfigSchemaTestBase extends WebTestBase { @@ -54,7 +54,14 @@ public static function getInfo() { } /** - * Tests default configuration data type. + * Asserts the TypedConfigManager has a valid schema for the configuration. + * + * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config + * The TypedConfigManager. + * @param string $config_name + * The configuration name. + * @param array $config_data + * The configuration data. */ public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) { $this->configName = $config_name;