Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / media / tests / src / FunctionalJavascript / MediaUiJavascriptTest.php

diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
index 981da61d59abe21dcc6c71776fdb5adc48d265d2..0116305771e73a2324dde62971dbf3bac0b72601 100644 (file)
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
@@ -38,11 +38,6 @@ class MediaUiJavascriptTest extends MediaJavascriptTestBase {
     parent::setUp();
     $this->drupalPlaceBlock('local_actions_block');
     $this->drupalPlaceBlock('local_tasks_block');
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-    MediaType::load('image')->delete();
   }
 
   /**
@@ -68,6 +63,10 @@ class MediaUiJavascriptTest extends MediaJavascriptTestBase {
     $this->assertJsCondition("jQuery('.form-item-source-configuration-test-config-value').length > 0;");
     $page->fillField('description', $description);
     $page->pressButton('Save');
+    // The wait prevents intermittent test failures.
+    $result = $assert_session->waitForLink('Add media type');
+    $this->assertNotEmpty($result);
+    $assert_session->addressEquals('admin/structure/media');
     $assert_session->pageTextContains('The media type ' . $name . ' has been added.');
     $this->drupalGet('admin/structure/media');
     $assert_session->pageTextContains($name);
@@ -139,6 +138,10 @@ class MediaUiJavascriptTest extends MediaJavascriptTestBase {
     $page->uncheckField('options[status]');
     $page->checkField('options[queue_thumbnail_downloads]');
     $page->pressButton('Save');
+    // The wait prevents intermittent test failures.
+    $result = $assert_session->waitForLink('Add media type');
+    $this->assertNotEmpty($result);
+    $assert_session->addressEquals('admin/structure/media');
     $assert_session->pageTextContains("The media type $new_name has been updated.");
 
     // Test if edit worked and if new field values have been saved as expected.