Commit 27853bcb authored by Dave Reid's avatar Dave Reid Committed by Dave Reid
Browse files

Issue #3248476 by Dave Reid, daniel_j: Removed test dependency on the Classy theme.

parent ebce3680

tests/modules/entity_embed_test/entity_embed_test.module

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ function entity_embed_test_entity_access(EntityInterface $entity, $operation, Ac 
 * Implements hook_entity_view_alter().

 */

function entity_embed_test_entity_view_alter(&$build, EntityInterface $entity, EntityViewDisplayInterface $display) {

  $build['#attributes']['data-entity-embed-test-view-mode'] = $display->getMode();

  $build['#attributes']['data-entity-embed-test-uuid'] = $entity->uuid();

  $build['#attributes']['data-entity-embed-test-view-mode'] = $build['#view_mode'];

  // @see \Drupal\Tests\entity_embed\FunctionalJavascript\MediaImageTest::testPreviewUsesDefaultTheme()

  $build['#attributes']['data-entity-embed-test-active-theme'] = \Drupal::theme()->getActiveTheme()->getName();

}

tests/src/Functional/ViewModeFieldFormatterTest.php

+2 −7
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ use Drupal\Core\Form\FormState; 
 */

class ViewModeFieldFormatterTest extends EntityEmbedTestBase {



  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';



  private $plugins = [

    'view_mode:node.full',

    'view_mode:node.rss',
@@ -53,8 +48,8 @@ class ViewModeFieldFormatterTest extends EntityEmbedTestBase { 
      $node = $this->drupalCreateNode($settings);

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

      $plugin = explode('.', $plugin);

      $view_mode = str_replace('_', '-', end($plugin));

      $this->assertSession()->responseContains('node--view-mode-' . $view_mode, 'Node rendered in the correct view mode: ' . $view_mode . '.');

      $view_mode = end($plugin);

      $this->assertSession()->elementExists('css', 'article[data-entity-embed-test-uuid="' . $this->node->uuid() . '"][data-entity-embed-test-view-mode="' . $view_mode . '"]');

    }

  }

tests/src/FunctionalJavascript/MediaImageTest.php

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ class MediaImageTest extends EntityEmbedTestBase { 
    // Configure a different default and admin theme, like on most Drupal sites.

    $this->config('system.theme')

      ->set('default', 'stable')

      ->set('admin', 'classy')

      ->set('admin', 'stark')

      ->save();



    // Assert that when looking at an embedded entity in the CKEditor Widget,

tests/src/Kernel/EntityEmbedFilterTest.php

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase { 
          'data-entity-uuid' => static::EMBEDDED_ENTITY_UUID,

          'data-view-mode' => 'full',

        ],

        'default',

        'full',

        [

          'data-entity-type' => 'node',

          'data-view-mode' => 'full',
@@ -128,7 +128,7 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase { 
          'data-entity-embed-display' => 'entity_reference:entity_reference_entity_view',

          'data-entity-embed-display-settings' => '{"view_mode":"full"}',

        ],

        'default',

        'full',

        [

          'data-entity-embed-display' => 'entity_reference:entity_reference_entity_view',

          'data-entity-embed-display-settings' => '{"view_mode":"full"}',
@@ -145,7 +145,7 @@ class EntityEmbedFilterTest extends EntityEmbedFilterTestBase { 
          'data-entity-embed-display-settings' => '{"view_mode":"full"}',

          'data-view-mode' => 'some-invalid-view-mode',

        ],

        'default',

        'full',

        [

          'data-entity-embed-display' => 'entity_reference:entity_reference_entity_view',

          'data-entity-embed-display-settings' => '{"view_mode":"full"}',