.../Block/BlockHalJsonBasicAuthTest.php | 6 ----- .../Comment/CommentHalJsonBasicAuthTest.php | 6 ----- .../ConfigTest/ConfigTestHalJsonBasicAuthTest.php | 5 ----- .../EntityTest/EntityTestHalJsonBasicAuthTest.php | 6 ----- .../Node/NodeHalJsonBasicAuthTest.php | 6 ----- .../Role/RoleHalJsonBasicAuthTest.php | 6 ----- .../Term/TermHalJsonBasicAuthTest.php | 6 ----- .../User/UserHalJsonBasicAuthTest.php | 6 ----- .../Vocabulary/VocabularyHalJsonBasicAuthTest.php | 6 ----- .../HalJsonBasicAuthWorkaroundFor2805281Trait.php | 26 ---------------------- 10 files changed, 79 deletions(-) diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php index 81ebf55..71f3b18 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Block; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase; @@ -38,9 +37,4 @@ class BlockHalJsonBasicAuthTest extends BlockResourceTestBase { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php index 8b6e4a3..7e2dc57 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Comment; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** @@ -22,9 +21,4 @@ class CommentHalJsonBasicAuthTest extends CommentHalJsonTestBase { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php index 489a3a5..f509892 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase; @@ -38,9 +37,5 @@ class ConfigTestHalJsonBasicAuthTest extends ConfigTestResourceTestBase { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php index 5604e3b..65ad0db 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** @@ -22,9 +21,4 @@ class EntityTestHalJsonBasicAuthTest extends EntityTestHalJsonAnonTest { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php index 1d7bb62..6ae1285 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Node; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** @@ -22,9 +21,4 @@ class NodeHalJsonBasicAuthTest extends NodeHalJsonAnonTest { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php index f540bb1..7ee8b28 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Role; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase; @@ -38,9 +37,4 @@ class RoleHalJsonBasicAuthTest extends RoleResourceTestBase { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php index 8c7b04b..5863338 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Term; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** @@ -22,9 +21,4 @@ class TermHalJsonBasicAuthTest extends TermHalJsonAnonTest { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php index dbf17cb..985b24c 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\User; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** @@ -22,9 +21,4 @@ class UserHalJsonBasicAuthTest extends UserHalJsonAnonTest { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php index 4f7896e..9343d8d 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Vocabulary; -use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait; use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; use Drupal\Tests\rest\Functional\EntityResource\Vocabulary\VocabularyResourceTestBase; @@ -38,9 +37,4 @@ class VocabularyHalJsonBasicAuthTest extends VocabularyResourceTestBase { */ protected static $auth = 'basic_auth'; - // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. - use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; - } - } diff --git a/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php b/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php deleted file mode 100644 index ef77d96..0000000 --- a/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php +++ /dev/null @@ -1,26 +0,0 @@ -assertSame(401, $response->getStatusCode()); - // @todo this works fine locally, but on testbot it comes back with - // 'text/plain; charset=UTF-8'. WTF. - // $this->assertSame(['application/hal+json'], $response->getHeader('Content-Type')); - $this->assertSame('No authentication credentials provided.', (string) $response->getBody()); - } - -}