diff --git a/core/modules/jsonapi/tests/src/Kernel/Controller/TemporaryJsonapiFileFieldUploaderTest.php b/core/modules/jsonapi/tests/src/Kernel/Controller/TemporaryJsonapiFileFieldUploaderTest.php index 03fc60943d..be7ab6812b 100644 --- a/core/modules/jsonapi/tests/src/Kernel/Controller/TemporaryJsonapiFileFieldUploaderTest.php +++ b/core/modules/jsonapi/tests/src/Kernel/Controller/TemporaryJsonapiFileFieldUploaderTest.php @@ -28,20 +28,6 @@ class TemporaryJsonapiFileFieldUploaderTest extends JsonapiKernelTestBase { 'user', ]; - /** - * The user. - * - * @var \Drupal\user\Entity\User - */ - protected $user; - - /** - * The node. - * - * @var \Drupal\node\Entity\Node - */ - protected $node; - /** * {@inheritdoc} */ @@ -91,23 +77,6 @@ protected function setUp(): void { 'bypass node access', ], ])->save(); - - $this->user = User::create([ - 'name' => 'user1', - 'mail' => 'user@localhost', - 'status' => 1, - // Do not use UID 1 as that has access to everything. - 'uid' => 2, - 'roles' => ['editor'], - ]); - $this->user->save(); - - $this->node = Node::create([ - 'title' => 'dummy_title', - 'type' => 'article', - 'uid' => $this->user->id(), - ]); - $this->node->save(); } /** @@ -148,7 +117,7 @@ public function testCheckFileUploadAccessWithBaseField() { $node = Node::create([ 'title' => 'dummy_title', 'type' => 'article', - 'uid' => $this->user->id(), + 'uid' => 1, ]); // While the method is only used to check file fields it should work without @@ -157,7 +126,7 @@ public function testCheckFileUploadAccessWithBaseField() { $bundle_field_definition = $this->container->get('entity_field.manager')->getFieldDefinitions('node', 'article')['field_relationships']; // Tests the expected access result for each user. - // The article editor can edit any article. + // The $article_editor account can edit any article. $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($article_editor, $base_field_definition, $node); $this->assertTrue($result->isAllowed()); // The article editor cannot create a node of undetermined type. @@ -171,8 +140,8 @@ public function testCheckFileUploadAccessWithBaseField() { $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($article_editor, $bundle_field_definition); $this->assertTrue($result->isAllowed()); - // The editor has the bypass node access permissions and can edit and create - // all node types. + // The $editor account has the bypass node access permissions and can edit + // and create all node types. $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($editor, $base_field_definition, $node); $this->assertTrue($result->isAllowed()); $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($editor, $base_field_definition); @@ -182,7 +151,8 @@ public function testCheckFileUploadAccessWithBaseField() { $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($editor, $bundle_field_definition); $this->assertTrue($result->isAllowed()); - // The page editor can only edit and create pages therefore has no access. + // The $page_editor account can only edit and create pages therefore has no + // access. $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($page_editor, $base_field_definition, $node); $this->assertFalse($result->isAllowed()); $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($page_editor, $base_field_definition); @@ -192,7 +162,7 @@ public function testCheckFileUploadAccessWithBaseField() { $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($page_editor, $bundle_field_definition); $this->assertFalse($result->isAllowed()); - // The no access user has no access at all. + // The $no_access_user account has no access at all. $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($no_access_user, $base_field_definition, $node); $this->assertFalse($result->isAllowed()); $result = TemporaryJsonapiFileFieldUploader::checkFileUploadAccess($no_access_user, $base_field_definition);