diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php index 5398c48..d21228b 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php @@ -135,7 +135,8 @@ protected function testMigrateUpgrade() { $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); - $this->drupalPostForm(NULL, [], t('Perform upgrade')); + $this->drupalPostForm(NULL, [], t('Perform upgrade', [], [], NULL, NULL,TRUE)); + $this->assertText(t('Congratulations, you upgraded Drupal!')); // Have to reset all the statics after migration to ensure entities are diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index eb1ad73..8a11420 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -1573,7 +1573,7 @@ protected function drupalGetXHR($path, array $options = array(), array $headers * POST data, so it must already be urlencoded and contain a leading "&" * (e.g., "&extra_var1=hello+world&extra_var2=you%26me"). */ - protected function drupalPostForm($path, $edit, $submit, array $options = array(), array $headers = array(), $form_html_id = NULL, $extra_post = NULL) { + protected function drupalPostForm($path, $edit, $submit, array $options = array(), array $headers = array(), $form_html_id = NULL, $extra_post = NULL, $debug = FALSE) { if (is_object($submit)) { // Cast MarkupInterface objects to string. $submit = (string) $submit; @@ -1662,6 +1662,9 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array( $verbose .= '
Fields: ' . highlight_string('' . $out; + if ($debug) { + debug($debug); + } $this->verbose($verbose); return $out; } diff --git a/core/modules/user/src/MigratePassword.php b/core/modules/user/src/MigratePassword.php index 4116c16..a462aa9 100644 --- a/core/modules/user/src/MigratePassword.php +++ b/core/modules/user/src/MigratePassword.php @@ -24,6 +24,13 @@ class MigratePassword implements PasswordInterface { protected $enabled = FALSE; /** + * Inidicates if the migrated password needs hashing. + * + * @var bool + */ + protected $needsHashing = TRUE; + + /** * Builds the replacement password service class. * * @param \Drupal\Core\Password\PasswordInterface $original_password diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index df61328..bddf098 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -102,8 +102,12 @@ exit(SIMPLETEST_SCRIPT_EXIT_SUCCESS); } -$test_list = simpletest_script_get_test_list(); - +//$test_list = simpletest_script_get_test_list(); +$test_list = [ + '\Drupal\migrate_drupal_ui\Tests\d7\MigrateUpgrade7Test', +// '\Drupal\Tests\file\Kernel\Migrate\d7\MigrateFileTest', +]; +$args['repeat'] = 40; // Try to allocate unlimited time to run the tests. drupal_set_time_limit(0); simpletest_script_reporter_init();