Commit 33e68322 authored by catch's avatar catch
Browse files

Revert "Issue #3228634 by Spokje, xjm, paulocs, tim.plunkett, Lendude: Move... 

Revert "Issue #3228634 by Spokje, xjm, paulocs, tim.plunkett, Lendude: Move tests for integrations between QuickEdit and other modules into QuickEdit so that it can more easily be moved into contrib"

This reverts commit e4ce9936.

(cherry picked from commit a3f40ba1)
parent d2da6f29

core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php→core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php

+3 −4
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\quickedit\Functional;

namespace Drupal\Tests\editor\Functional;



use Drupal\Component\Serialization\Json;

use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
@@ -10,9 +10,9 @@ 
/**

 * Tests Quick Edit module integration endpoints.

 *

 * @group quickedit

 * @group editor

 */

class EditorIntegrationLoadingTest extends BrowserTestBase {

class QuickEditIntegrationLoadingTest extends BrowserTestBase {



  /**

   * Modules to enable.
@@ -71,7 +71,6 @@ 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

core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php→core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php

+4 −4
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\quickedit\Kernel;

namespace Drupal\Tests\editor\Kernel;



use Drupal\Component\Serialization\Json;

use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
@@ -8,6 +8,7 @@ 
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;
@@ -18,9 +19,9 @@ 
/**

 * Tests Edit module integration (Editor module's inline editing support).

 *

 * @group quickedit

 * @group editor

 */

class EditorIntegrationTest extends QuickEditTestBase {

class QuickEditIntegrationTest extends QuickEditTestBase {



  /**

   * {@inheritdoc}
@@ -138,7 +139,6 @@ 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');

core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php→core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php

+2 −3
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\quickedit\Functional;

namespace Drupal\Tests\image\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 quickedit

 * @group image

 */

class QuickEditImageControllerTest extends BrowserTestBase {
@@ -76,7 +76,6 @@ 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);

core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php→core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php

+1 −1
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\quickedit\FunctionalJavascript;

namespace Drupal\Tests\image\FunctionalJavascript;



/**

 * @see \Drupal\image\Plugin\InPlaceEditor\Image

core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php→core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php

+3 −3
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\quickedit\FunctionalJavascript;

namespace Drupal\Tests\image\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 quickedit

 * @group image

 */

class QuickEditImageTest extends QuickEditJavascriptTestBase {
@@ -62,7 +63,6 @@ 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 = [