diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigSchemaTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigSchemaTest.php deleted file mode 100644 index ee7883f..0000000 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigSchemaTest.php +++ /dev/null @@ -1,61 +0,0 @@ - 'Migrate action configuration schema', - 'description' => 'Tests the configuration schema of action module', - 'group' => 'Migrate Drupal', - ); - } - - /** - * {@inheritdoc} - */ - public function setUp() { - parent::setUp(); - $migration = entity_load('migration', 'd6_action_settings'); - $dumps = array( - $this->getDumpDirectory() . '/Drupal6ActionSettings.php', - ); - $this->prepare($migration, $dumps); - $executable = new MigrateExecutable($migration, $this); - $executable->import(); - } - - /** - * Tests migration of action variables to action.settings.yml. - */ - public function testActionConfigSchema() { - $config_data = \Drupal::config('action.settings')->get(); - $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config_data); - } - -} diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php index b3e36dd..d9ced7d 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateActionConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,12 @@ public function testActionSettings() { $this->assertIdentical($config->get('recursion_limit'), 35); } + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('action.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config_data); + } + }