diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php index 583250ead46b..b6768b1b0e6f 100644 --- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php +++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php @@ -15,7 +15,6 @@ class MediaEmbedFilterDisabledIntegrationsTest extends MediaEmbedFilterTestBase */ protected static $modules = [ 'contextual', - 'quickedit', // @see media_test_embed_entity_view_alter() 'media_test_embed', ]; @@ -29,16 +28,14 @@ class MediaEmbedFilterDisabledIntegrationsTest extends MediaEmbedFilterTestBase $this->container->get('current_user') ->addRole($this->drupalCreateRole([ 'access contextual links', - 'access in-place editing', ])); } /** * @covers ::renderMedia * @covers ::disableContextualLinks - * @dataProvider providerDisabledIntegrations */ - public function testDisabledIntegrations($integration_detection_selector) { + public function testDisabledIntegrations() { $text = $this->createEmbedCode([ 'data-entity-type' => 'media', 'data-entity-uuid' => static::EMBEDDED_ENTITY_UUID, @@ -46,21 +43,7 @@ class MediaEmbedFilterDisabledIntegrationsTest extends MediaEmbedFilterTestBase $this->applyFilter($text); $this->assertCount(1, $this->cssSelect('div[data-media-embed-test-view-mode]')); - $this->assertCount(0, $this->cssSelect($integration_detection_selector)); - } - - /** - * Data provider for testDisabledIntegrations(). - */ - public function providerDisabledIntegrations() { - return [ - 'contextual' => [ - 'div[data-media-embed-test-view-mode].contextual-region', - ], - 'quickedit' => [ - 'div[data-media-embed-test-view-mode][data-quickedit-entity-id]', - ], - ]; + $this->assertCount(0, $this->cssSelect('div[data-media-embed-test-view-mode].contextual-region')); } } diff --git a/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php b/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php similarity index 97% rename from core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php rename to core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php index 5f9baaa1e4de..bce74ceec80d 100644 --- a/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php +++ b/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php @@ -1,6 +1,6 @@ container->get('current_user') + ->addRole($this->drupalCreateRole([ + 'access contextual links', + 'access in-place editing', + ])); + } + + /** + * @covers ::renderMedia + * @covers ::disableContextualLinks + */ + public function testDisabledIntegrations() { + $text = $this->createEmbedCode([ + 'data-entity-type' => 'media', + 'data-entity-uuid' => static::EMBEDDED_ENTITY_UUID, + ]); + + $this->applyFilter($text); + $this->assertCount(1, $this->cssSelect('div[data-media-embed-test-view-mode]')); + $this->assertCount(0, $this->cssSelect('div[data-media-embed-test-view-mode][data-quickedit-entity-id]')); + } + +}