From 50a700f950801a9b70819cd61a09d1c5879fa2f2 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 20 Aug 2019 11:41:44 +1000
Subject: [PATCH] Issue #3075422 by Wim Leers: Follow-up for #2821077: address
forgotten @todo in UserTest::testPatchDxForSecuritySensitiveBaseFields()
---
.../jsonapi/tests/src/Functional/UserTest.php | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/core/modules/jsonapi/tests/src/Functional/UserTest.php b/core/modules/jsonapi/tests/src/Functional/UserTest.php
index 1a72f7f2bf37..2277714de8ed 100644
--- a/core/modules/jsonapi/tests/src/Functional/UserTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/UserTest.php
@@ -201,13 +201,6 @@ public function testPatchDxForSecuritySensitiveBaseFields() {
$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 @@ public function testPatchDxForSecuritySensitiveBaseFields() {
$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 @@ public function testPatchDxForSecuritySensitiveBaseFields() {
$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 @@ public function testPatchDxForSecuritySensitiveBaseFields() {
$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';
--
GitLab