diff --git a/core/modules/content_moderation/src/Tests/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php similarity index 95% rename from core/modules/content_moderation/src/Tests/ModerationFormTest.php rename to core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php index 16da4e4548032a0dcfc01d737b16d0d883ebb00c..3e4199154f051175a66db5219cc3f7f8defeb8b9 100644 --- a/core/modules/content_moderation/src/Tests/ModerationFormTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\content_moderation\Tests; +namespace Drupal\Tests\content_moderation\Functional; /** * Tests the moderation form, specifically on nodes. @@ -27,7 +27,7 @@ protected function setUp() { * the default revision is not a published moderation state. * * @see \Drupal\content_moderation\EntityOperations - * @see \Drupal\content_moderation\Tests\ModerationStateBlockTest::testCustomBlockModeration + * @see \Drupal\Tests\content_moderation\Functional\ModerationStateBlockTest::testCustomBlockModeration */ public function testModerationForm() { // Create new moderated content in draft. diff --git a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php similarity index 98% rename from core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php rename to core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php index 593a9f961872c46ec69c24925842233094cba2af..d45fb7b33737eed9db896c4e390da24bb41f3807 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\content_moderation\Tests; +namespace Drupal\Tests\content_moderation\Functional; use Drupal\block_content\Entity\BlockContent; use Drupal\block_content\Entity\BlockContentType; diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php similarity index 98% rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php index 49eee6d52718ccf5791e6805b1fb9038acef6c80..7579afa4e6e75adbd126209855413b905436eff4 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\content_moderation\Tests; +namespace Drupal\Tests\content_moderation\Functional; use Drupal\Core\Url; use Drupal\node\Entity\Node; @@ -132,7 +132,7 @@ public function testPagers() { $this->drupalLogin($this->adminUser); $this->drupalGet('admin/content'); $element = $this->cssSelect('nav.pager li.is-active a'); - $url = (string) $element[0]['href']; + $url = $element[0]->getAttribute('href'); $query = []; parse_str(parse_url($url, PHP_URL_QUERY), $query); $this->assertEqual(0, $query['page']); diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php similarity index 98% rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php index 1911d9f2ba725565c803951fc14e24bc1ce0dad4..8391dd0aaea1a2d47113b40a9954194ced088acf 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\content_moderation\Tests; +namespace Drupal\Tests\content_moderation\Functional; /** * Tests moderation state node type integration.