Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3075422 by Wim Leers: Follow-up for #2821077: address forgotten @todo in UserTest::testPatchDxForSecuritySensitiveBaseFields()

merge-requests/55/head
Lee Rowlands 2019-08-20 11:41:44 +10:00
parent d4ae87ea4c
commit 50a700f950
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/modules/jsonapi/tests/src/Functional/UserTest.php
View File

@ -201,13 +201,6 @@ class UserTest extends ResourceTestBase {
$url = Url::fromRoute(sprintf('jsonapi.user--user.individual'), ['entity' => $this->account->uuid()]);
/* $url = $this->account->toUrl('jsonapi'); */
$original_normalization = $this->normalize($this->account, $url);
// @todo Remove the array_diff_key() call in https://www.drupal.org/node/2821077.
$original_normalization['data']['attributes'] = array_diff_key(
$original_normalization['data']['attributes'],
['created' => TRUE, 'changed' => TRUE, 'name' => TRUE]
);
// Since this test must be performed by the user that is being modified,
// we must use $this->account, not $this->entity.
$request_options = [];
@ -215,6 +208,9 @@ class UserTest extends ResourceTestBase {
$request_options[RequestOptions::HEADERS]['Content-Type'] = 'application/vnd.api+json';
$request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions());
$response = $this->request('GET', $url, $request_options);
$original_normalization = Json::decode((string) $response->getBody());
// Test case 1: changing email.
$normalization = $original_normalization;
$normalization['data']['attributes']['mail'] = 'new-email@example.com';
@ -246,7 +242,7 @@ class UserTest extends ResourceTestBase {
$this->assertResourceResponse(200, FALSE, $response);
// Test case 2: changing password.
$normalization = $original_normalization;
$normalization = Json::decode((string) $response->getBody());
$normalization['data']['attributes']['mail'] = 'new-email@example.com';
$new_password = $this->randomString();
$normalization['data']['attributes']['pass']['value'] = $new_password;
@ -274,7 +270,7 @@ class UserTest extends ResourceTestBase {
$request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions());
// Test case 3: changing name.
$normalization = $original_normalization;
$normalization = Json::decode((string) $response->getBody());
$normalization['data']['attributes']['mail'] = 'new-email@example.com';
$normalization['data']['attributes']['pass']['existing'] = $new_password;
$normalization['data']['attributes']['name'] = 'Cooler Llama';