diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php index 6703939..5e62521 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php @@ -108,7 +108,7 @@ function testNew() { 'label' => 'New', 'style' => '', 'langcode' => 'und', - 'description' => '', + 'protected_property' => '', ); $staging->write($dynamic_name, $original_dynamic_data); diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php index 93fa9ca..b193f00 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php @@ -60,7 +60,7 @@ function testImport() { 'label' => 'New', 'style' => '', 'langcode' => 'und', - 'description' => '', + 'protected_property' => '', ); $staging->write($dynamic_name, $original_dynamic_data); @@ -130,21 +130,4 @@ function prepareSiteNameUpdate($new_site_name) { $staging->write('system.site', $config_data); } - /** - * Tests updating existing configuration. - */ - public function testUpdate() { - // Create a staged version of the configuration object with different data. - $config_data = config('config_test.dynamic.default')->get(); - $config_data['description'] = $this->randomName(); - $this->container->get('config.storage.staging')->write('config_test.dynamic.default', $config_data); - - $this->drupalGet('admin/config/development/sync'); - $this->drupalPost(NULL, array(), t('Import all')); - $this->assertText(t('There is no configuration to import.')); - - $entity = entity_load('config_test', 'default'); - $this->assertIdentical($entity->get('description'), $config_data['description']); - } - } diff --git a/core/modules/config/tests/config_test/config/config_test.dynamic.default.yml b/core/modules/config/tests/config_test/config/config_test.dynamic.default.yml index df0a149..fefeed5 100644 --- a/core/modules/config/tests/config_test/config/config_test.dynamic.default.yml +++ b/core/modules/config/tests/config_test/config/config_test.dynamic.default.yml @@ -1,3 +1,3 @@ id: default label: Default -description: Default +protected_property: Default diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php index c99ecc2..574c100 100644 --- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php @@ -63,11 +63,11 @@ class ConfigTest extends ConfigEntityBase { public $style; /** - * The description for the configuration entity. + * A protected property of the configuration entity. * * @var string */ - protected $description; + protected $protected_property; /** * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::getExportProperties(); @@ -75,7 +75,7 @@ class ConfigTest extends ConfigEntityBase { public function getExportProperties() { $properties = parent::getExportProperties(); $protected_names = array( - 'description', + 'protected_property', ); foreach ($protected_names as $name) { $properties[$name] = $this->get($name);