.../MediaEmbedFilterConfigurationUiTest.php        | 115 +++++++++++++++++++--
 1 file changed, 106 insertions(+), 9 deletions(-)

diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
index d6c0a14a8f..7621cfbc78 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
    * @covers ::media_filter_format_edit_form_validate
    * @dataProvider providerTestValidations
    */
-  public function testValidationWhenAdding($filter_html_status, $media_embed_status, $allowed_html, $expected_error_message) {
+  public function testValidationWhenAdding($filter_html_status, $filter_align_status, $filter_caption_status, $filter_html_image_secure_status, $media_embed, $allowed_html, $expected_error_message) {
     $this->drupalGet('admin/config/content/formats/add');
 
     // Enable the `filter_html` and `media_embed` filters.
@@ -55,8 +55,22 @@ public function testValidationWhenAdding($filter_html_status, $media_embed_statu
     if ($filter_html_status) {
       $page->checkField('filters[filter_html][status]');
     }
-    if ($media_embed_status) {
+    if ($filter_align_status) {
+      $page->checkField('filters[filter_align][status]');
+    }
+    if ($filter_caption_status) {
+      $page->checkField('filters[filter_caption][status]');
+    }
+    if ($filter_html_image_secure_status) {
+      $page->checkField('filters[filter_html_image_secure][status]');
+    }
+    if ($media_embed === TRUE || is_numeric($media_embed)) {
       $page->checkField('filters[media_embed][status]');
+      // Set a non-default weight.
+      if (is_numeric($media_embed)) {
+        $this->click('.tabledrag-toggle-weight');
+        $page->selectFieldOption('filters[media_embed][weight]', $media_embed);
+      }
     }
     if (!empty($allowed_html)) {
       $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
@@ -77,7 +91,7 @@ public function testValidationWhenAdding($filter_html_status, $media_embed_statu
    * @covers ::media_filter_format_edit_form_validate
    * @dataProvider providerTestValidations
    */
-  public function testValidationWhenEditing($filter_html_status, $media_embed_status, $allowed_html, $expected_error_message) {
+  public function testValidationWhenEditing($filter_html_status, $filter_align_status, $filter_caption_status, $filter_html_image_secure_status, $media_embed, $allowed_html, $expected_error_message) {
     $this->drupalGet('admin/config/content/formats/manage/media_embed_test');
 
     // Enable the `filter_html` and `media_embed` filters.
@@ -85,8 +99,22 @@ public function testValidationWhenEditing($filter_html_status, $media_embed_stat
     if ($filter_html_status) {
       $page->checkField('filters[filter_html][status]');
     }
-    if ($media_embed_status) {
+    if ($filter_align_status) {
+      $page->checkField('filters[filter_align][status]');
+    }
+    if ($filter_caption_status) {
+      $page->checkField('filters[filter_caption][status]');
+    }
+    if ($filter_html_image_secure_status) {
+      $page->checkField('filters[filter_html_image_secure][status]');
+    }
+    if ($media_embed === TRUE || is_numeric($media_embed)) {
       $page->checkField('filters[media_embed][status]');
+      // Set a non-default weight.
+      if (is_numeric($media_embed)) {
+        $this->click('.tabledrag-toggle-weight');
+        $page->selectFieldOption('filters[media_embed][weight]', $media_embed);
+      }
     }
     if (!empty($allowed_html)) {
       $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
@@ -110,34 +138,103 @@ public function providerTestValidations() {
     return [
       'Tests that no filter_html occurs when filter_html not enabled.' => [
         'filters[filter_html][status]' => FALSE,
-        'filters[media_embed][status]' => TRUE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => TRUE,
         'allowed_html' => FALSE,
         'expected_error_message' => FALSE,
       ],
       'Tests validation when both filter_html and media_embed are disabled.' => [
         'filters[filter_html][status]' => FALSE,
-        'filters[media_embed][status]' => FALSE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => FALSE,
         'allowed_html' => FALSE,
         'expected_error_message' => FALSE,
       ],
       'Tests validation when media_embed filter not enabled and filter_html is enabled.' => [
         'filters[filter_html][status]' => TRUE,
-        'filters[media_embed][status]' => FALSE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => FALSE,
         'allowed_html' => 'default',
         'expected_error_message' => FALSE,
       ],
       'Tests validation when drupal-media element has no attributes.' => [
         'filters[filter_html][status]' => TRUE,
-        'filters[media_embed][status]' => TRUE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => TRUE,
         'allowed_html' => "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media>",
         'expected_error_message' => 'The <drupal-media> tag in the allowed HTML tags is missing the following attributes: data-entity-type, data-entity-uuid, data-view-mode.',
       ],
       'Tests validation when drupal-media element lacks some required attributes.' => [
         'filters[filter_html][status]' => TRUE,
-        'filters[media_embed][status]' => TRUE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => TRUE,
         'allowed_html' => "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media data-entity-type data-entity-uuid data-align>",
         'expected_error_message' => 'The <drupal-media> tag in the allowed HTML tags is missing the following attributes: data-view-mode.',
       ],
+      'Tests validation when both filter_html and media_embed are enabled and configured correctly' => [
+        'filters[filter_html][status]' => TRUE,
+        'filters[filter_align][status]' => FALSE,
+        'filters[filter_caption][status]' => FALSE,
+        'filters[filter_html_image_secure][status]' => FALSE,
+        'media_embed' => TRUE,
+        'allowed_html' => "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media data-entity-type data-entity-uuid data-view-mode>",
+        'expected_error_message' => FALSE,
+      ],
+      'Order validation: media_embed before all filters' => [
+        'filter_html' => TRUE,
+        'filter_align' => TRUE,
+        'filter_caption' => TRUE,
+        'filter_html_image_secure' => TRUE,
+        'media_embed' => -5,
+        'allowed_html' => "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media data-entity-type data-entity-uuid data-view-mode>",
+        'expected_error_message' => 'The Embed media filter needs to be placed after the following filters: Align images, Caption images, Restrict images to this site.',
+      ],
+      'Order validation: media_embed before filter_align' => [
+        'filter_html' => FALSE,
+        'filter_align' => TRUE,
+        'filter_caption' => FALSE,
+        'filter_html_image_secure' => FALSE,
+        'media_embed' => -5,
+        'allowed_html' => '',
+        'expected_error_message' => 'The Embed media filter needs to be placed after the Align images filter.',
+      ],
+      'Order validation: media_embed before filter_caption' => [
+        'filter_html' => FALSE,
+        'filter_align' => FALSE,
+        'filter_caption' => TRUE,
+        'filter_html_image_secure' => FALSE,
+        'media_embed' => -5,
+        'allowed_html' => '',
+        'expected_error_message' => 'The Embed media filter needs to be placed after the Caption images filter.',
+      ],
+      'Order validation: media_embed before filter_html_image_secure' => [
+        'filter_html' => FALSE,
+        'filter_align' => FALSE,
+        'filter_caption' => FALSE,
+        'filter_html_image_secure' => TRUE,
+        'media_embed' => -5,
+        'allowed_html' => '',
+        'expected_error_message' => 'The Embed media filter needs to be placed after the Restrict images to this site filter.',
+      ],
+      'Order validation: media_embed after filter_align and filter_caption but before filter_html_image_secure' => [
+        'filter_html' => TRUE,
+        'filter_align' => TRUE,
+        'filter_caption' => TRUE,
+        'filter_html_image_secure' => TRUE,
+        'media_embed' => 5,
+        'allowed_html' => "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media data-entity-type data-entity-uuid data-view-mode>",
+        'expected_error_message' => 'The Embed media filter needs to be placed after the Restrict images to this site filter.',
+      ],
     ];
   }