diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index 7f240e3..a57dc37 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -190,7 +190,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'table', '#header' => array('Name', 'Operations'), '#rows' => array(), - '#empty' => $this->t('There are no configuration changes to import.'), + '#empty' => empty($source_list) ? $this->t('There are no staged configurations.') : $this->t('The staged configuration is identical to the active configuration.'), ); $form['actions']['#access'] = FALSE; return $form; diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php index 6a63df7..6ec9d46 100644 --- a/core/modules/config/src/Tests/ConfigExportImportUITest.php +++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php @@ -93,7 +93,7 @@ public function testExportImport() { // After installation there is no snapshot and nothing to import. $this->drupalGet('admin/config/development/configuration'); $this->assertNoText(t('Warning message')); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('There are no staged configurations.')); $this->originalSlogan = $this->config('system.site')->get('slogan'); $this->newSlogan = $this->randomString(16); @@ -169,13 +169,13 @@ public function testExportImport() { $this->drupalPostForm('admin/config/development/configuration/full/import', array('files[import_tarball]' => $filename), 'Upload'); // There is no snapshot yet because an import has never run. $this->assertNoText(t('Warning message')); - $this->assertNoText(t('There are no configuration changes to import.')); + $this->assertNoText(t('There are no staged configurations.')); $this->assertText($this->contentType->label()); $this->drupalPostForm(NULL, array(), 'Import all'); // After importing the snapshot has been updated an there are no warnings. $this->assertNoText(t('Warning message')); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); $this->assertEqual($this->config('system.site')->get('slogan'), $this->newSlogan); @@ -194,7 +194,7 @@ public function testExportImport() { $this->drupalGet('admin/config/development/configuration'); $this->assertNoText(t('Warning message')); $this->assertNoText('The following items in your active configuration have changes since the last import that may be lost on the next import. system.site'); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('There are no staged configurations.')); // Write a file to staging. The warning about differences between the // active and snapshot should now exist. /** @var \Drupal\Core\Config\StorageInterface $staging */ @@ -272,7 +272,7 @@ public function testExportImportCollections() { $this->drupalPostForm('admin/config/development/configuration/full/import', array('files[import_tarball]' => $filename), 'Upload'); // Verify that there are configuration differences to import. $this->drupalGet('admin/config/development/configuration'); - $this->assertNoText(t('There are no configuration changes to import.')); + $this->assertNoText(t('There are no staged configurations.')); $this->assertText(t('!collection configuration collection', array('!collection' => 'collection.test1'))); $this->assertText(t('!collection configuration collection', array('!collection' => 'collection.test2'))); $this->assertText('config_test.create'); @@ -289,7 +289,7 @@ public function testExportImportCollections() { $this->assertLinkByHref('admin/config/development/configuration/sync/diff_collection/collection.test2/config_test.another_delete'); $this->drupalPostForm(NULL, array(), 'Import all'); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); // Test data in collections. $data = $test1_storage->read('config_test.create'); diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php index dd00edf..684b332 100644 --- a/core/modules/config/src/Tests/ConfigImportUITest.php +++ b/core/modules/config/src/Tests/ConfigImportUITest.php @@ -50,7 +50,7 @@ function testImport() { $staging = $this->container->get('config.storage.staging'); $this->drupalGet('admin/config/development/configuration'); - $this->assertText('There are no configuration changes to import.'); + $this->assertText('The staged configuration is identical to the active configuration.'); $this->assertNoFieldById('edit-submit', t('Import all')); // Create updated configuration object. @@ -132,7 +132,7 @@ function testImport() { $this->assertNoFieldById('edit-submit', t('Import all')); // Verify that there are no further changes to import. - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); // Verify site name has changed. $this->assertIdentical($new_site_name, $this->config('system.site')->get('name')); @@ -232,7 +232,7 @@ function testImportLock() { // Verify that there are configuration differences to import. $this->drupalGet('admin/config/development/configuration'); - $this->assertNoText(t('There are no configuration changes to import.')); + $this->assertNoText(t('The staged configuration is identical to the active configuration.')); // Acquire a fake-lock on the import mechanism. $config_importer = $this->configImporter(); @@ -322,7 +322,7 @@ public function testImportValidation() { $this->prepareSiteNameUpdate($new_site_name); $this->drupalGet('admin/config/development/configuration'); - $this->assertNoText(t('There are no configuration changes to import.')); + $this->assertNoText(t('The staged configuration is identical to the active configuration.')); $this->drupalPostForm(NULL, array(), t('Import all')); // Verify that the validation messages appear. @@ -399,14 +399,14 @@ function testImportErrorLog() { $staging->write($name_secondary, $values_secondary); // Verify that there are configuration differences to import. $this->drupalGet('admin/config/development/configuration'); - $this->assertNoText(t('There are no configuration changes to import.')); + $this->assertNoText(t('The staged configuration is identical to the active configuration.')); // Attempt to import configuration and verify that an error message appears. $this->drupalPostForm(NULL, array(), t('Import all')); $this->assertText(SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary))); $this->assertText(t('The configuration was imported with errors.')); $this->assertNoText(t('The configuration was imported successfully.')); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); } /** @@ -445,7 +445,7 @@ public function testEntityBundleDelete() { $node->delete(); $this->drupalPostForm(NULL, array(), t('Import all')); $this->assertNoRaw($validation_message); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); $this->assertNoText(format_string('node.type.@type', array('@type' => $node_type->id()))); $this->assertNoText(format_string('field.field.node.@type.body', array('@type' => $node_type->id()))); $this->assertNoText(format_string('core.entity_view_display.node.@type.teaser', array('@type' => $node_type->id()))); diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php index af29bce..84be11c 100644 --- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php +++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php @@ -131,7 +131,7 @@ public function testConfigurationRename() { // Run the import. $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all')); - $this->assertText(t('There are no configuration changes to import.')); + $this->assertText(t('The staged configuration is identical to the active configuration.')); $this->assertFalse(NodeType::load($active_type), 'The content no longer exists with the old name.'); $content_type = NodeType::load($staged_type);