.../src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php | 2 +- .../Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php | 2 +- .../EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php | 2 +- .../EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php | 2 +- .../EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php | 2 +- .../src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php | 2 +- core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php | 2 +- core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php | 2 +- core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php | 2 +- .../src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php | 2 +- .../Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php | 2 +- .../EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php | 2 +- .../tests/src/Functional/EntityResource/EntityResourceTestBase.php | 4 ++-- .../EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php | 2 +- .../src/Functional/EntityResource/User/UserJsonBasicAuthTest.php | 2 +- .../EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php | 2 +- .../tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php | 2 +- core/modules/rest/tests/src/Functional/ResourceTestBase.php | 2 +- 25 files changed, 26 insertions(+), 26 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 d4f8a12..81ebf55 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class BlockHalJsonBasicAuthTest extends BlockResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 9461f23..6b42f3b 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php @@ -24,7 +24,7 @@ class CommentHalJsonBasicAuthTest extends CommentHalJsonAnonTest { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 c24397a..489a3a5 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class ConfigTestHalJsonBasicAuthTest extends ConfigTestResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 063e1e3..5604e3b 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php @@ -24,7 +24,7 @@ class EntityTestHalJsonBasicAuthTest extends EntityTestHalJsonAnonTest { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 1132ee0..1d7bb62 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php @@ -24,7 +24,7 @@ class NodeHalJsonBasicAuthTest extends NodeHalJsonAnonTest { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 9b9932f..f540bb1 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class RoleHalJsonBasicAuthTest extends RoleResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 59b754a..8c7b04b 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php @@ -24,7 +24,7 @@ class TermHalJsonBasicAuthTest extends TermHalJsonAnonTest { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 0ffef7f..dbf17cb 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php @@ -24,7 +24,7 @@ class UserHalJsonBasicAuthTest extends UserHalJsonAnonTest { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + 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 03c9232..4f7896e 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class VocabularyHalJsonBasicAuthTest extends VocabularyResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use HalJsonBasicAuthWorkaroundFor2805281Trait { - HalJsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php b/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php index c4c6e39..28c9bea 100644 --- a/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php +++ b/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php @@ -15,7 +15,7 @@ * * @todo Fix in https://www.drupal.org/node/2805281: remove this trait. */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { $this->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')); diff --git a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php index ab8b9a3..3e1a912 100644 --- a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php +++ b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php @@ -10,7 +10,7 @@ /** * {@inheritdoc} */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { throw new \LogicException('When testing for anonymous users, authentication cannot be missing.'); } diff --git a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php index 7134585..64c4d7f 100644 --- a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php +++ b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php @@ -24,7 +24,7 @@ protected function getAuthenticationRequestOptions($method) { /** * {@inheritdoc} */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { $this->assertResourceErrorResponse(401, 'No authentication credentials provided.', $response); } diff --git a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php index f313b96..c085247 100644 --- a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php +++ b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php @@ -78,7 +78,7 @@ protected function getAuthenticationRequestOptions($method) { /** * {@inheritdoc} */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { $this->assertResourceErrorResponse(403, '', $response); } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php index a29c38d..f191e12 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class BlockJsonBasicAuthTest extends BlockResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php index 470c158..34ddd72 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class CommentJsonBasicAuthTest extends CommentResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php index bd73278..309a8f1 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class ConfigTestJsonBasicAuthTest extends ConfigTestResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php index 0637b70..a86495b 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php @@ -214,7 +214,7 @@ public function testGet() { // response. if (static::$auth) { $response = $this->request('GET', $url, $request_options); - $this->verifyResponseWhenMissingAuthentication($response); + $this->assertResponseWhenMissingAuthentication($response); } $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('GET')); @@ -431,7 +431,7 @@ public function testPost() { // DX: forgetting authentication: authentication provider-specific error // response. $response = $this->request('POST', $url, $request_options); - $this->verifyResponseWhenMissingAuthentication($response); + $this->assertResponseWhenMissingAuthentication($response); } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php index 1b45e25..4625ed3 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class EntityTestJsonBasicAuthTest extends EntityTestResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php index 0200d49..f79776e 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class NodeJsonBasicAuthTest extends NodeResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php index 5cc463c..b03ab5c 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php @@ -40,7 +40,7 @@ class RoleJsonBasicAuthTest extends RoleResourceTestBase { /** * {@inheritdoc} */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { $this->assertSame(401, $response->getStatusCode()); $this->assertSame('{"message":"A fatal error occurred: No authentication credentials provided."}', (string)$response->getBody()); } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php index 6ee100a..6befa3a 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class TermJsonBasicAuthTest extends TermResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php index ddecc29..f67e0a6 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class UserJsonBasicAuthTest extends UserResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php index 1840a21..1060050 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php @@ -39,7 +39,7 @@ class VocabularyJsonBasicAuthTest extends VocabularyResourceTestBase { // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage. use JsonBasicAuthWorkaroundFor2805281Trait { - JsonBasicAuthWorkaroundFor2805281Trait::verifyResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; + JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait; } } diff --git a/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php b/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php index 2d76a71..c392f0c 100644 --- a/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php +++ b/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php @@ -13,7 +13,7 @@ * * @todo Fix in https://www.drupal.org/node/2805281: remove this trait. */ - protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response) { + protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) { $this->assertSame(401, $response->getStatusCode()); $this->assertSame([static::$expectedErrorMimeType], $response->getHeader('Content-Type')); // Note that strange 'A fatal error occurred: ' prefix, that should not diff --git a/core/modules/rest/tests/src/Functional/ResourceTestBase.php b/core/modules/rest/tests/src/Functional/ResourceTestBase.php index fe75a7e..07cf862 100644 --- a/core/modules/rest/tests/src/Functional/ResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/ResourceTestBase.php @@ -180,7 +180,7 @@ protected function provisionResource($resource_type, $formats = [], $authenticat * * @return void */ - abstract protected function verifyResponseWhenMissingAuthentication(ResponseInterface $response); + abstract protected function assertResponseWhenMissingAuthentication(ResponseInterface $response); /** * Asserts authentication provider-specific edge cases.