diff --git a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php index 5e7f2a2..da545b2 100644 --- a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php +++ b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php @@ -100,7 +100,10 @@ protected function setUp() { * * @dataProvider providerTestBuildCacheability */ - public function testBuildCacheability($description, $tree, $expected_build) { + public function testBuildCacheability($description, $tree, $expected_build, $access, array $access_cache_contexts = []) { + if ($access !== NULL) { + $access->addCacheContexts($access_cache_contexts); + } $build = $this->menuLinkTree->build($tree); sort($expected_build['#cache']['contexts']); $this->assertEquals($expected_build, $build, $description); @@ -175,13 +178,12 @@ public function providerTestBuildCacheability() { 'description' => 'Empty tree.', 'tree' => [], 'expected_build' => $base_expected_build_empty, + 'access' => NULL, + 'access_cache_contexts' => [], ]; for ($i = 0; $i < count($access_scenarios); $i++) { list($access, $access_cache_contexts) = $access_scenarios[$i]; - if ($access !== NULL) { - $access->addCacheContexts($access_cache_contexts); - } for ($j = 0; $j < count($links_scenarios); $j++) { $links = $links_scenarios[$j]; @@ -203,6 +205,8 @@ public function providerTestBuildCacheability() { 'description' => "Single-item tree; access=$i; link=$j.", 'tree' => $tree, 'expected_build' => $expected_build, + 'access' => $access, + 'access_cache_contexts' => $access_cache_contexts, ]; // Single-level tree. @@ -221,6 +225,8 @@ public function providerTestBuildCacheability() { 'description' => "Single-level tree; access=$i; link=$j.", 'tree' => $tree, 'expected_build' => $expected_build, + 'access' => $access, + 'access_cache_contexts' => $access_cache_contexts, ]; // Multi-level tree. @@ -251,6 +257,8 @@ public function providerTestBuildCacheability() { 'description' => "Multi-level tree; access=$i; link=$j.", 'tree' => $tree, 'expected_build' => $expected_build, + 'access' => $access, + 'access_cache_contexts' => $access_cache_contexts, ]; } } diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php index 1397685..11f66ef 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php @@ -592,7 +592,7 @@ public function providerTestChildAccessInheritance() { $data['access-false-root'] = [$clone, $expected_access]; $clone = $element; - $access_result = AccessResult::forbidden()->addCacheContexts(['user']); + $access_result = AccessResult::forbidden(); $clone['#access'] = $access_result; $expected_access = []; @@ -624,11 +624,9 @@ public function providerTestChildAccessInheritance() { // Allow access on the most outer level but forbid otherwise. $clone = $element; - $access_result_allowed = AccessResult::allowed() - ->addCacheContexts(['user']); + $access_result_allowed = AccessResult::allowed(); $clone['#access'] = $access_result_allowed; - $access_result_forbidden = AccessResult::forbidden() - ->addCacheContexts(['user']); + $access_result_forbidden = AccessResult::forbidden(); $clone['child0']['#access'] = $access_result_forbidden; $expected_access = [];