Issue #3122112 by alexpott, longwave, jungle, hussainweb, catch, xjm,…

… greg.1.anderson: Update dependencies for Drupal 8.9
drupal · May 9, 2020 · f3e6be0 · f3e6be0
1 parent 682bd3c
commit f3e6be0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php b/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php
@@ -73,7 +73,7 @@ public function testExceptionThrow() {
     $messages = $id_map_plugin->getMessages(['url' => $invalid_url])->fetchAll();
     $this->assertCount(1, $messages);
     $message = reset($messages);
-    $this->assertEquals("Cannot read from non-readable stream ($invalid_url)", $message->message);
+    $this->assertEquals("Client error: `GET $invalid_url` resulted in a `404 Not Found` response ($invalid_url)", $message->message);
     $this->assertEquals(MigrationInterface::MESSAGE_ERROR, $message->level);
 
     // Check that the second row was migrated successfully.

diff --git a/tests/Drupal/Tests/UiHelperTrait.php b/tests/Drupal/Tests/UiHelperTrait.php
@@ -528,7 +528,7 @@ protected function checkForMetaRefresh() {
     if (!empty($refresh) && (!isset($this->maximumMetaRefreshCount) || $this->metaRefreshCount < $this->maximumMetaRefreshCount)) {
       // Parse the content attribute of the meta tag for the format:
       // "[delay]: URL=[page_to_redirect_to]".
-      if (preg_match('/\d+;\s*URL=(?<url>.*)/i', $refresh[0]->getAttribute('content'), $match)) {
+      if (preg_match('/\d+;\s*URL=\'?(?<url>[^\']*)/i', $refresh[0]->getAttribute('content'), $match)) {
         $this->metaRefreshCount++;
         return $this->drupalGet($this->getAbsoluteUrl(Html::decodeEntities($match['url'])));
       }