From 3cdeded2c677ed5db5aca5c98be15c2c17f9cdd8 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sat, 3 Feb 2024 17:18:41 +0000
Subject: [PATCH] Issue #3417365 by kristiaanvandeneynde, smustgrave: Properly
set current_user service in tests
(cherry picked from commit eb8cd5d6b86b752d670e96bef284636453d3e0a6)
---
.../src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php | 1 +
core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php | 1 +
.../modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php | 2 +-
.../user/tests/src/Kernel/UserAccountFormPasswordResetTest.php | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
index b6768b1b0e6f..2f630fbcb74f 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
@@ -26,6 +26,7 @@ protected function setUp(): void {
parent::setUp();
$this->container->get('current_user')
+ ->getAccount()
->addRole($this->drupalCreateRole([
'access contextual links',
]));
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
index e2b4b820ad8d..6a9e6717ac0b 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
@@ -136,6 +136,7 @@ public function testAccessUnpublished($allowed_to_view_unpublished, $expected_re
// Are we testing as a user who is allowed to view the embedded entity?
if ($allowed_to_view_unpublished) {
$this->container->get('current_user')
+ ->getAccount()
->addRole($this->drupalCreateRole(['view own unpublished media']));
}
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
index 1f39eef6db64..dcf5065785a7 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
@@ -86,7 +86,7 @@ protected function setUp(): void {
'access content',
'view media',
]);
- $this->container->set('current_user', $user);
+ $this->container->get('current_user')->setAccount($user);
$this->image = File::create([
'uri' => $this->getTestFiles('image')[0]->uri,
diff --git a/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php b/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
index 779f72b698a6..95bf84056da7 100644
--- a/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
+++ b/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void {
$this->user->save();
// Set current user.
- $this->container->set('current_user', $this->user);
+ $this->container->get('current_user')->setAccount($this->user);
// Install the router table and then rebuild.
\Drupal::service('router.builder')->rebuild();
}
--
GitLab