diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php --- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -75,8 +75,10 @@ 'date_timezone', 'date_api', 'help', + 'i18n', 'i18nstrings', 'imageapi', + 'number', 'openid', 'php', 'poll', @@ -108,7 +110,6 @@ 'profile', 'trigger', 'toolbar', - 'trigger', 'views', 'views_ui', ]; diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php --- b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php @@ -17,6 +17,16 @@ /** * {@inheritdoc} */ + public static $missing_count = 6; + + /** + * {@inheritdoc} + */ + public static $available_count = 52; + + /** + * {@inheritdoc} + */ protected function setUp() { parent::setUp(); $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); @@ -93,25 +103,19 @@ 'date', 'dblog', 'email', - 'entityreference', - 'file', 'filefield', 'filter', + 'forum', 'i18ntaxonomy', - 'image', 'imagecache', 'imagefield', 'link', - 'list', 'menu', 'locale', 'node', - 'node_reference', - 'number', - 'options', + 'nodereference', 'optionwidgets', 'path', - 'phone', 'profile', 'search', 'system', @@ -120,16 +124,27 @@ 'translation', 'upload', 'user', - 'user_reference', + 'userreference', // Modules that have no upgrade path. + 'blog', + 'color', + 'date_timezone', 'date_api', 'help', + 'i18n', + 'i18nstrings', 'imageapi', - 'nodereference', + 'openid', 'php', - 'userreference', + 'poll', + 'profile', + 'trigger', + 'tracker', + 'variable', 'variable_admin', 'views', + 'views_export', + 'views_ui', ]; } @@ -138,15 +153,10 @@ */ protected function getMissingPaths() { return [ - 'date_timezone', 'event', - 'i18n', 'i18nblocks', 'i18ncck', 'i18ncontent', - 'i18nmenu', - 'i18nprofile', - 'i18nstrings', ]; } diff -u b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php --- b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php @@ -22,6 +22,16 @@ /** * {@inheritdoc} */ + public static $missing_count = 3; + + /** + * {@inheritdoc} + */ + public static $available_count = 53; + + /** + * {@inheritdoc} + */ protected function setUp() { parent::setUp(); $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php'); @@ -99,20 +109,16 @@ 'field', 'field_sql_storage', 'file', - 'filefield', 'filter', 'forum', 'image', - 'imagefield', 'link', 'list', 'locale', 'menu', 'node', - 'node_reference', 'number', 'options', - 'optionwidgets', 'path', 'phone', 'search', @@ -123,18 +129,27 @@ 'text', 'translation', 'user', - 'user_reference', + 'tracker', + 'update', // Modules that have no upgrade path. 'blog', 'contextual', + 'dashboard', 'date_api', 'entity', 'field_ui', 'help', + 'openid', 'overlay', 'php', - 'toolbar', + 'poll', + 'profile', + 'simpletest', + 'syslog', 'trigger', + 'toolbar', + 'views', + 'views_ui', ]; } @@ -143,13 +158,16 @@ */ protected function getMissingPaths() { return [ + 'blog', 'book', 'color', + 'contextual', + 'date_api', + 'entity', + 'field_ui', + 'help', + 'php', 'rdf', - 'simpletest', - 'syslog', - 'tracker', - 'update', ]; } only in patch2: unchanged: --- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php +++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php @@ -70,11 +70,11 @@ public function testProvidersExist() { public function testFieldProvidersExist() { $expected_mappings = [ 'userreference' => [ - 'source_module' => 'user_reference', + 'source_module' => 'userreference', 'destination_module' => 'core', ], 'nodereference' => [ - 'source_module' => 'node_reference', + 'source_module' => 'nodereference', 'destination_module' => 'core', ], 'optionwidgets' => [ only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php @@ -11,6 +11,7 @@ * Provides a base class for testing migration upgrades in the UI. */ abstract class MigrateUpgradeTestBase extends BrowserTestBase { + use MigrationConfigurationTrait; /** @@ -45,6 +46,20 @@ ]; /** + * Count of modules that will not be upgraded. + * + * @var array + */ + public static $missing_count; + + /** + * Count of modules that will be upgraded. + * + * @var array + */ + public static $available_count; + + /** * {@inheritdoc} */ protected function setUp() { @@ -196,6 +211,10 @@ public function testMigrateUpgrade() { $session->elementNotExists('xpath', "//span[contains(@class, 'checked') and text() = '$missing']"); } + // Test the total count of missing and available paths. + $session->elementsCount('xpath', "//span[contains(@class, 'upgrade-analysis-report__status-icon--warning')]", (int) static::$missing_count); + $session->elementsCount('xpath', "//span[contains(@class, 'upgrade-analysis-report__status-icon--checked')]", (int) static::$available_count); + $this->drupalPostForm(NULL, [], t('Perform upgrade')); $this->assertText(t('Congratulations, you upgraded Drupal!'));