diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php index 583250ead46b7ce6844d7d7ca20bdbffe0331e66..b6768b1b0e6f62252066c623dfe88b35fe1c0e19 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 @@ protected function setUp(): void { $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 @@ public function testDisabledIntegrations($integration_detection_selector) { $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 822922322b6ecad7111d20f1c2c9fecd5e25b7f7..c766bcac6f9577049422cfde8152bfa5fe4291f9 100644 --- a/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php +++ b/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\editor\Functional; +namespace Drupal\Tests\quickedit\Functional; use Drupal\Component\Serialization\Json; use Drupal\Core\EventSubscriber\MainContentViewSubscriber; @@ -10,9 +10,9 @@ /** * Tests Quick Edit module integration endpoints. * - * @group editor + * @group quickedit */ -class QuickEditIntegrationLoadingTest extends BrowserTestBase { +class EditorIntegrationLoadingTest extends BrowserTestBase { /** * Modules to enable. @@ -71,6 +71,7 @@ protected function setUp(): void { * Tests loading of untransformed text when a user doesn't have access to it. */ public function testUsersWithoutPermission() { + $this->fail(); // Create 3 users, each with insufficient permissions, i.e. without either // or both of the following permissions: // - the 'access in-place editing' permission diff --git a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderQuickEditTest.php b/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php similarity index 95% rename from core/modules/layout_builder/tests/src/Functional/LayoutBuilderQuickEditTest.php rename to core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php index 7da55cc8f90cdd190ecfdc0aea436ade28282097..06ddb323987c1242b970e04366a3dba20dc309ed 100644 --- a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderQuickEditTest.php +++ b/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php @@ -1,13 +1,13 @@ <?php -namespace Drupal\Tests\layout_builder\Functional; +namespace Drupal\Tests\quickedit\Functional; use Drupal\Tests\BrowserTestBase; /** * Tests Layout Builder integration with Quick Edit. * - * @group layout_builder + * @group quickedit */ class LayoutBuilderQuickEditTest extends BrowserTestBase { @@ -45,6 +45,7 @@ protected function setUp(): void { * Tests Quick Edit integration with a block from a different entity type. */ public function testPlaceFieldBlockFromDifferentEntityType() { + $this->fail(); $page = $this->getSession()->getPage(); $this->drupalLogin($this->drupalCreateUser([ diff --git a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php b/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php similarity index 98% rename from core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php rename to core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php index 66e386eae2590e794411ef3652a553d573634618..82416d1ab14e98ef18f93f59bfebb41b72012ed2 100644 --- a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php +++ b/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\image\Functional; +namespace Drupal\Tests\quickedit\Functional; use Drupal\Component\Serialization\Json; use Drupal\Tests\BrowserTestBase; @@ -10,7 +10,7 @@ /** * Tests the endpoints used by the "image" in-place editor. * - * @group image + * @group quickedit */ class QuickEditImageControllerTest extends BrowserTestBase { @@ -76,6 +76,7 @@ protected function setUp(): void { * Tests that routes restrict access for un-privileged users. */ public function testAccess() { + $this->fail(); // Create an anonymous user. $user = $this->createUser(); $this->drupalLogin($user); diff --git a/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php similarity index 94% rename from core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php rename to core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php index b64ebf98cc16f3370d178fa42641b7cb907b5e23..eb154e881802dbcb087beef3165c5773d1a62649 100644 --- a/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\inline_form_errors\FunctionalJavascript; +namespace Drupal\Tests\quickedit\FunctionalJavascript; use Drupal\FunctionalJavascriptTests\WebDriverTestBase; use Drupal\node\Entity\NodeType; @@ -8,9 +8,9 @@ /** * Tests Inline Form Errors compatibility with Quick Edit. * - * @group inline_form_errors + * @group quickedit */ -class FormErrorHandlerQuickEditTest extends WebDriverTestBase { +class InlineFormErrorsIntegrationTest extends WebDriverTestBase { /** * Modules to enable. @@ -60,6 +60,7 @@ protected function setUp(): void { * Tests that the inline form errors are not visible for Quick Edit forms. */ public function testDisabledInlineFormErrors() { + $this->fail(); $session = $this->getSession(); $web_assert = $this->assertSession(); diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php similarity index 98% rename from core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php rename to core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php index 48e697043bbd6840663307b107af0ef784582206..b25cf8750cb913d498a1b9a2773758695f9c2a63 100644 --- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php @@ -1,11 +1,10 @@ <?php -namespace Drupal\Tests\layout_builder\FunctionalJavascript; +namespace Drupal\Tests\quickedit\FunctionalJavascript; use Drupal\node\Entity\NodeType; use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait; use Drupal\Tests\field\Traits\EntityReferenceTestTrait; -use Drupal\Tests\quickedit\FunctionalJavascript\QuickEditJavascriptTestBase; /** * Tests that Layout Builder functions with Quick Edit. @@ -13,7 +12,7 @@ * @covers layout_builder_entity_view_alter() * @covers layout_builder_quickedit_render_field() * - * @group layout_builder + * @group quickedit */ class LayoutBuilderQuickEditTest extends QuickEditJavascriptTestBase { @@ -94,6 +93,7 @@ protected function setUp(): void { * @see https://www.drupal.org/project/drupal/issues/3041850 */ public function testQuickEditIgnoresDuplicateFields() { + $this->fail(); // Place the body field a second time using Layout Builder. $this->enableLayouts('admin/structure/types/manage/article/display/default'); $page = $this->getSession()->getPage(); diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php similarity index 98% rename from core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php rename to core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php index c23342db9a476270ed50e3bb7072f3f4c671d8a1..f647d88b28dfd6c77e0ba6e1904c6f511a923558 100644 --- a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\image\FunctionalJavascript; +namespace Drupal\Tests\quickedit\FunctionalJavascript; /** * @see \Drupal\image\Plugin\InPlaceEditor\Image diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php similarity index 98% rename from core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php rename to core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php index d97faf89e47cc11ad3c80f7c63ced0f31b56ebd4..4b1a0f9ea5a98d20a1dfdc0b3abcbfe2d6f9dc53 100644 --- a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php @@ -1,15 +1,14 @@ <?php -namespace Drupal\Tests\image\FunctionalJavascript; +namespace Drupal\Tests\quickedit\FunctionalJavascript; use Drupal\file\Entity\File; use Drupal\Tests\image\Kernel\ImageFieldCreationTrait; -use Drupal\Tests\quickedit\FunctionalJavascript\QuickEditJavascriptTestBase; use Drupal\Tests\TestFileCreationTrait; /** * @coversDefaultClass \Drupal\image\Plugin\InPlaceEditor\Image - * @group image + * @group quickedit */ class QuickEditImageTest extends QuickEditJavascriptTestBase { @@ -63,6 +62,7 @@ protected function setUp(): void { * @covers ::getAttachments */ public function testImageInPlaceEditor() { + $this->fail(); // Create a field with a basic filetype restriction. $field_name = strtolower($this->randomMachineName()); $field_settings = [ diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php similarity index 96% rename from core/modules/settings_tray/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php rename to core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php index 7c7313beab07c54742c026dcdd2e4c6af474ccd2..c3108cf84a25e6c90a57a8b3bbf72e6d0cfaaad0 100644 --- a/core/modules/settings_tray/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php @@ -1,17 +1,18 @@ <?php -namespace Drupal\Tests\settings_tray\FunctionalJavascript; +namespace Drupal\Tests\quickedit\FunctionalJavascript; use Drupal\block_content\Entity\BlockContent; use Drupal\block_content\Entity\BlockContentType; +use Drupal\Tests\settings_tray\FunctionalJavascript\SettingsTrayTestBase; use Drupal\user\Entity\Role; /** * Test Settings Tray and Quick Edit modules integration. * - * @group settings_tray + * @group quickedit */ -class QuickEditIntegrationTest extends SettingsTrayTestBase { +class SettingsTrayIntegrationTest extends SettingsTrayTestBase { /** * {@inheritdoc} @@ -47,6 +48,7 @@ protected function setUp(): void { * Tests QuickEdit links behavior. */ public function testQuickEditLinks() { + $this->fail(); $quick_edit_selector = '#quickedit-entity-toolbar'; $node_selector = '[data-quickedit-entity-id="node/1"]'; $body_selector = '[data-quickedit-field-id="node/1/body/en/full"]'; diff --git a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php b/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php similarity index 97% rename from core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php rename to core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php index 9f49d76d07742c3951370d4e0cd22d53a8368a26..645e592da9eb5ba2fb0b69da13d7985d4a610990 100644 --- a/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php +++ b/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\editor\Kernel; +namespace Drupal\Tests\quickedit\Kernel; use Drupal\Component\Serialization\Json; use Drupal\Core\EventSubscriber\AjaxResponseSubscriber; @@ -8,7 +8,6 @@ use Drupal\editor\Entity\Editor; use Drupal\entity_test\Entity\EntityTest; use Drupal\quickedit\MetadataGenerator; -use Drupal\Tests\quickedit\Kernel\QuickEditTestBase; use Drupal\quickedit_test\MockQuickEditEntityFieldAccessCheck; use Drupal\editor\EditorController; use Symfony\Component\HttpFoundation\Request; @@ -19,9 +18,9 @@ /** * Tests Edit module integration (Editor module's inline editing support). * - * @group editor + * @group quickedit */ -class QuickEditIntegrationTest extends QuickEditTestBase { +class EditorIntegrationTest extends QuickEditTestBase { /** * {@inheritdoc} @@ -139,6 +138,7 @@ protected function getSelectedEditor($entity_id, $field_name, $view_mode = 'defa * format compatibility. */ public function testEditorSelection() { + $this->fail(); $this->editorManager = $this->container->get('plugin.manager.quickedit.editor'); $this->editorSelector = $this->container->get('quickedit.editor.selector'); diff --git a/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php new file mode 100644 index 0000000000000000000000000000000000000000..7557d5cf7913a1ce7def21650ad4c5d427188172 --- /dev/null +++ b/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php @@ -0,0 +1,54 @@ +<?php + +namespace Drupal\Tests\quickedit\Kernel; + +use Drupal\Tests\media\Kernel\MediaEmbedFilterTestBase; + +/** + * Tests that media embed disables certain integrations. + * + * @coversDefaultClass \Drupal\media\Plugin\Filter\MediaEmbed + * @group quickedit + */ +class MediaEmbedFilterDisabledIntegrationsTest extends MediaEmbedFilterTestBase { + + /** + * {@inheritdoc} + */ + protected static $modules = [ + 'contextual', + 'quickedit', + // @see media_test_embed_entity_view_alter() + 'media_test_embed', + ]; + + /** + * {@inheritdoc} + */ + protected function setUp(): void { + parent::setUp(); + + $this->container->get('current_user') + ->addRole($this->drupalCreateRole([ + 'access contextual links', + 'access in-place editing', + ])); + } + + /** + * @covers ::renderMedia + * @covers ::disableContextualLinks + */ + public function testDisabledIntegrations() { + $this->fail(); + $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]')); + } + +}