Unverified Commit 1e9d9b5b authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3275807 by danflanagan8, nod_, larowlan: Media Tests should not rely on Classy 

(cherry picked from commit 1f14841c)
(cherry picked from commit bb7750ab)
parent 15873552

core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php

+8 −1
Original line number Diff line number Diff line
@@ -45,7 +45,14 @@ class CKEditorIntegrationTest extends WebDriverTestBase { 
  protected static $modules = ['node', 'ckeditor', 'filter', 'ckeditor_test'];



  /**

   * {@inheritdoc}

   * The theme to install as the default for testing.

   *

   * @var string

   *

   * @todo This test's reliance on classes makes Stark a bad fit as a base theme.

   *   Change the default theme to Starterkit once it is stable.

   *

   * @see https://www.drupal.org/project/drupal/issues/3275827

   */

  protected function setUp(): void {

    parent::setUp();

core/modules/media/tests/src/Functional/MediaAccessTest.php

+8 −6
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class MediaAccessTest extends MediaFunctionalTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}
@@ -185,11 +185,13 @@ public function testMediaAccess() { 
    $this->clickLink('Media');

    $this->assertCacheContext('user');

    $assert_session->statusCodeEquals(200);

    $assert_session->elementExists('css', '.view-media');

    $assert_session->pageTextContains($this->loggedInUser->getDisplayName());

    $assert_session->pageTextContains($this->nonAdminUser->getDisplayName());

    $assert_session->linkByHrefExists('/media/' . $media->id());

    $assert_session->linkByHrefExists('/media/' . $user_media->id());

    $assert_session->elementExists('css', '.views-element-container');

    // First row of the View contains media created by admin user.

    $assert_session->elementTextEquals('xpath', '//div[@class="views-element-container"]//tbody/tr[1]/td[contains(@class, "views-field-uid")]/a', $this->adminUser->getDisplayName());

    $assert_session->elementTextEquals('xpath', "//div[@class='views-element-container']//tbody/tr[1]/td[contains(@class, 'views-field-name')]/a[contains(@href, '/media/{$media->id()}')]", 'Unnamed');

    // Second row of the View contains media created by non-admin user.

    $assert_session->elementTextEquals('xpath', '//div[@class="views-element-container"]//tbody/tr[2]/td[contains(@class, "views-field-uid")]/a', $this->nonAdminUser->getDisplayName());

    $assert_session->elementTextEquals('xpath', "//div[@class='views-element-container']//tbody/tr[2]/td[contains(@class, 'views-field-name')]/a[contains(@href, '/media/{$user_media->id()}')]", 'Unnamed');

  }



  /**

core/modules/media/tests/src/Functional/MediaOverviewPageTest.php

+3 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class MediaOverviewPageTest extends MediaFunctionalTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}
@@ -133,11 +133,9 @@ public function testMediaOverviewPage() { 
    $this->assertSame($expected, $changed_element1->getText());



    // Operations.

    $edit_link1 = $assert_session->elementExists('css', 'td.views-field-operations li.edit a', $row1);

    $this->assertSame('Edit', $edit_link1->getText());

    $assert_session->elementExists('css', 'td.views-field-operations li a:contains("Edit")', $row1);

    $assert_session->linkByHrefExists('/media/' . $media1->id() . '/edit');

    $delete_link1 = $assert_session->elementExists('css', 'td.views-field-operations li.delete a', $row1);

    $this->assertSame('Delete', $delete_link1->getText());

    $assert_session->elementExists('css', 'td.views-field-operations li a:contains("Delete")', $row1);

    $assert_session->linkByHrefExists('/media/' . $media1->id() . '/delete');



    // Make the user the owner of the unpublished media item and assert the

core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php

+26 −26
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class MediaDisplayTest extends MediaJavascriptTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}
@@ -62,8 +62,10 @@ public function testMediaDisplay() { 
    $media->save();



    $this->drupalGet('media/' . $media->id());

    // Verify the "name" field is really not present.

    $assert_session->elementNotExists('css', '.field--name-name');

    // Verify the "name" field is really not present. The name should be in the

    // h1 with no additional markup in the h1.

    $assert_session->elementTextContains('css', 'h1', $media->getName());

    $assert_session->elementNotExists('css', 'h1 div');



    // Enable the field on the display and verify it becomes visible on the UI.

    $this->drupalGet("/admin/structure/media/manage/{$media_type->id()}/display");
@@ -73,10 +75,10 @@ public function testMediaDisplay() { 
    $assert_session->waitForElementVisible('css', '#edit-fields-name-settings-edit');

    $page->pressButton('Save');

    $this->drupalGet('media/' . $media->id());

    // Verify the name is present, and its text matches what is expected.

    $assert_session->elementExists('css', '.field--name-name');

    $name_field = $page->find('css', '.field--name-name .field__item');

    $this->assertSame($media->label(), $name_field->getText());

    // Verify the name is present, and its text matches what is expected. Now

    // there should be markup in the h1.

    $assert_session->elementTextContains('xpath', '//h1/div/div[1]', 'Name');

    $assert_session->elementTextContains('xpath', '//h1/div/div[2]', $media->getName());



    // In the standard profile, there are some pre-cooked types. Make sure the

    // elements configured on their displays are the expected ones.
@@ -100,23 +102,22 @@ public function testMediaDisplay() { 
    $this->drupalGet('/media/' . $image_media_id);



    // Check if the default media name is generated as expected.

    $assert_session->elementTextContains('css', 'h1', $image_media_name);

    $assert_session->elementTextContains('xpath', '//h1', $image_media_name);

    // Here we expect to see only the image, nothing else.

    // Assert only one element in the content region.

    $this->assertCount(1, $page->findAll('css', '.media--type-image > div'));

    $media_item = $assert_session->elementExists('xpath', '//div[@class="layout-content"]/div/div[2]');

    $assert_session->elementsCount('xpath', '/div', 1, $media_item);

    // Assert the image is present inside the media element.

    $media_item = $assert_session->elementExists('css', '.media--type-image > div');

    $assert_session->elementExists('css', 'img', $media_item);

    $media_image = $assert_session->elementExists('xpath', '//img', $media_item);

    // Assert that the image src uses the large image style, the label is

    // visually hidden, and there is no link to the image file.

    $media_image = $assert_session->elementExists('css', '.media--type-image img');

    /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */

    $file_url_generator = \Drupal::service('file_url_generator');

    $expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg'));

    $this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src'));

    $field = $assert_session->elementExists('css', '.field--name-field-media-image');

    $assert_session->elementExists('css', '.field__label.visually-hidden', $field);

    $assert_session->elementNotExists('css', 'a', $field);

    $field = $assert_session->elementExists('xpath', '/div[1]', $media_item);

    $assert_session->elementExists('xpath', '/div[@class="visually-hidden"]', $field);

    $assert_session->elementNotExists('xpath', '//a', $field);



    $test_filename = $this->randomMachineName() . '.txt';

    $test_filepath = 'public://' . $test_filename;
@@ -134,10 +135,10 @@ public function testMediaDisplay() { 
    $assert_session->elementTextContains('css', 'h1', $test_filename);

    // Here we expect to see only the linked filename.

    // Assert only one element in the content region.

    $this->assertCount(1, $page->findAll('css', 'article.media--type-document > div'));

    $media_item = $assert_session->elementExists('xpath', '//div[@class="layout-content"]/div/div[2]');

    $assert_session->elementsCount('xpath', '/div', 1, $media_item);

    // Assert the file link is present, and its text matches the filename.

    $assert_session->elementExists('css', 'article.media--type-document .field--name-field-media-document a');

    $link = $page->find('css', 'article.media--type-document .field--name-field-media-document a');

    $link = $assert_session->elementExists('xpath', '//a', $media_item);

    $this->assertSame($test_filename, $link->getText());



    // Create a node type "page" to use as host entity.
@@ -176,7 +177,7 @@ public function testMediaDisplay() { 
    \Drupal::service('entity_display.repository')->getViewDisplay('node', $node_type->id())

      ->setComponent('field_related_media', [

        'type' => 'entity_reference_entity_view',

        'label' => 'hidden',

        'label' => 'above',

        'settings' => [

          'view_mode' => 'full',

        ],
@@ -192,15 +193,14 @@ public function testMediaDisplay() { 
    $node->save();



    $this->drupalGet('/node/' . $node->id());

    // Media field is there.

    $assert_session->elementExists('css', '.field--name-field-related-media');

    // Media field (field_related_media) is there.

    $assert_session->pageTextContains('Related media');

    // Media name element is not there.

    $assert_session->elementNotExists('css', '.field--name-name');

    $assert_session->pageTextNotContains($image_media_name);

    // Only one element is present inside the media container.

    $this->assertCount(1, $page->findAll('css', '.field--name-field-related-media article.media--type-image > div'));

    // Assert the image is present.

    $assert_session->elementExists('css', '.field--name-field-related-media article.media--type-image img');

    // Only one image is present.

    $assert_session->elementsCount('xpath', '//img', 1);

    // The image has the correct image style.

    $assert_session->elementAttributeContains('xpath', '//img', 'src', '/styles/large/');

  }



}

core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ protected function waitUntilVisible($selector, $timeout = 1000, $message = '') { 
   */

  protected function assertLinkToCreatedMedia() {

    $assert_session = $this->assertSession();

    $selector = '.messages a';

    $selector = 'div[aria-label="Status message"] a';



    // Get the canonical media entity URL from the creation message.

    $link = $assert_session->elementExists('css', $selector);