Skip to content
Snippets Groups Projects
Commit 71b96c16 authored by catch's avatar catch
Browse files

Merge branch '3389804-split-up-mediaconfigurationuitest' into '11.x' 

Issue #3389804: Split up MediaConfigurationUiTest

See merge request !4879
parents dff46835 dd37763a
No related branches found
No related tags found
No related merge requests found
Pipeline #23720 failed
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#23726

    Hide whitespace changes
    Inline Side-by-side
    core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiAddTest.php 0 → 100644
    + 59
    − 0
    View file @ 71b96c16
    <?php
    namespace Drupal\Tests\media\FunctionalJavascript;
    /**
    * @covers ::media_filter_format_edit_form_validate
    * @group media
    * @group #slow
    */
    class MediaEmbedFilterConfigurationUiAddTest extends MediaEmbedFilterTestBase {
    /**
    * @covers ::media_form_filter_format_add_form_alter
    * @dataProvider providerTestValidations
    */
    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.
    $page = $this->getSession()->getPage();
    $page->fillField('name', 'Another test format');
    $this->showHiddenFields();
    $page->findField('format')->setValue('another_media_embed_test');
    if ($filter_html_status) {
    $page->checkField('filters[filter_html][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->clickLink('Limit allowed HTML tags and correct faulty HTML');
    $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
    }
    $page->pressButton('Save configuration');
    if ($expected_error_message) {
    $this->assertSession()->pageTextNotContains('Added text format Another test format.');
    $this->assertSession()->pageTextContains($expected_error_message);
    }
    else {
    $this->assertSession()->pageTextContains('Added text format Another test format.');
    }
    }
    }
    core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiEditTest.php 0 → 100644
    + 56
    − 0
    View file @ 71b96c16
    <?php
    namespace Drupal\Tests\media\FunctionalJavascript;
    /**
    * @covers ::media_filter_format_edit_form_validate
    * @group media
    * @group #slow
    */
    class MediaEmbedFilterConfigurationUiEditTest extends MediaEmbedFilterTestBase {
    /**
    * @covers ::media_form_filter_format_edit_form_alter
    * @dataProvider providerTestValidations
    */
    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.
    $page = $this->getSession()->getPage();
    if ($filter_html_status) {
    $page->checkField('filters[filter_html][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->clickLink('Limit allowed HTML tags and correct faulty HTML');
    $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
    }
    $page->pressButton('Save configuration');
    if ($expected_error_message) {
    $this->assertSession()->pageTextNotContains('The text format Test format has been updated.');
    $this->assertSession()->pageTextContains($expected_error_message);
    }
    else {
    $this->assertSession()->pageTextContains('The text format Test format has been updated.');
    }
    }
    }
    core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php → core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterTestBase.php
    + 2
    − 95
    View file @ 71b96c16
    ......@@ -5,11 +5,9 @@
    use Drupal\filter\Entity\FilterFormat;
    /**
    * @covers ::media_filter_format_edit_form_validate
    * @group media
    * @group #slow
    * Base class for media embed filter configuration tests.
    */
    class MediaEmbedFilterConfigurationUiTest extends MediaJavascriptTestBase {
    class MediaEmbedFilterTestBase extends MediaJavascriptTestBase {
    /**
    * {@inheritdoc}
    ......@@ -51,97 +49,6 @@ protected function setUp(): void {
    ]));
    }
    /**
    * @covers ::media_form_filter_format_add_form_alter
    * @dataProvider providerTestValidations
    */
    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.
    $page = $this->getSession()->getPage();
    $page->fillField('name', 'Another test format');
    $this->showHiddenFields();
    $page->findField('format')->setValue('another_media_embed_test');
    if ($filter_html_status) {
    $page->checkField('filters[filter_html][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->clickLink('Limit allowed HTML tags and correct faulty HTML');
    $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
    }
    $page->pressButton('Save configuration');
    if ($expected_error_message) {
    $this->assertSession()->pageTextNotContains('Added text format Another test format.');
    $this->assertSession()->pageTextContains($expected_error_message);
    }
    else {
    $this->assertSession()->pageTextContains('Added text format Another test format.');
    }
    }
    /**
    * @covers ::media_form_filter_format_edit_form_alter
    * @dataProvider providerTestValidations
    */
    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.
    $page = $this->getSession()->getPage();
    if ($filter_html_status) {
    $page->checkField('filters[filter_html][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->clickLink('Limit allowed HTML tags and correct faulty HTML');
    $page->fillField('filters[filter_html][settings][allowed_html]', $allowed_html);
    }
    $page->pressButton('Save configuration');
    if ($expected_error_message) {
    $this->assertSession()->pageTextNotContains('The text format Test format has been updated.');
    $this->assertSession()->pageTextContains($expected_error_message);
    }
    else {
    $this->assertSession()->pageTextContains('The text format Test format has been updated.');
    }
    }
    /**
    * Data provider for testing validation when adding and editing media embeds.
    */
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment