diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php similarity index 82% rename from core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php rename to core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php index 04f2048eac..3c475e2068 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php @@ -1,15 +1,15 @@ pass_raw = 'john.doe_pass'; + $user->passRaw = 'john.doe_pass'; $this->drupalLogin($user); } diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/html-1.txt b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/html-1.txt similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/html-1.txt rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/html-1.txt diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-1.png b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-1.png similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-1.png rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-1.png diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-2.jpg b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-2.jpg similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-2.jpg rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-2.jpg diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.gif b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.gif similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.gif rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.gif diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.jpg b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.jpg similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.jpg rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.jpg diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.png b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.png similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.png rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/core/modules/simpletest/files/image-test.png diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/tmp/some-temp-file.jpg b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/tmp/some-temp-file.jpg similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d6/files/tmp/some-temp-file.jpg rename to core/modules/migrate_drupal_ui/tests/src/Functional/d6/files/tmp/some-temp-file.jpg diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php similarity index 92% rename from core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php rename to core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php index 94a42e2c95..6bb46a9fec 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php @@ -1,8 +1,8 @@ pass_raw = 'a password'; + $user->passRaw = 'a password'; $this->drupalLogin($user); } diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/cube.jpeg b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/files/sites/default/files/cube.jpeg similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/cube.jpeg rename to core/modules/migrate_drupal_ui/tests/src/Functional/d7/files/sites/default/files/cube.jpeg diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/ds9.txt b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/files/sites/default/files/ds9.txt similarity index 100% rename from core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/ds9.txt rename to core/modules/migrate_drupal_ui/tests/src/Functional/d7/files/sites/default/files/ds9.txt diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index bd50c23b48..b4c55cd42e 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -1419,4 +1419,26 @@ protected function checkForMetaRefresh() { return FALSE; } + /** + * Transforms a nested array into a flat array suitable for BrowserTestBase::drupalPostForm(). + * + * @param array $values + * A multi-dimensional form values array to convert. + * + * @return array + * The flattened $edit array suitable for BrowserTestBase::drupalPostForm(). + */ + protected function translatePostValues(array $values) { + $edit = []; + // The easiest and most straightforward way to translate values suitable for + // BrowserTestBase::drupalPostForm() is to actually build the POST data string + // and convert the resulting key/value pairs back into a flat array. + $query = http_build_query($values); + foreach (explode('&', $query) as $item) { + list($key, $value) = explode('=', $item); + $edit[urldecode($key)] = urldecode($value); + } + return $edit; + } + } diff --git a/test.html b/test.html new file mode 100644 index 0000000000..615febdd51 --- /dev/null +++ b/test.html @@ -0,0 +1,176 @@ +$this->getSession()->getPage()->getHtml(); + +
+ + + + + + +