From 1a0793dad49f0f1401c477da4b67b1ae5c50db96 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 9 Nov 2012 20:13:44 +0000
Subject: [PATCH] Issue #1814402 by Lars Toomre, moe4715: Convert
'node_access_test_private()' variable to state() system.
---
core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php | 4 ++--
.../forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php | 2 +-
.../node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php | 2 +-
.../tests/modules/node_access_test/node_access_test.module | 4 ++--
.../lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php | 3 +--
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
index 2febd5f556e2..357d8bf0cc9e 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
@@ -27,10 +27,10 @@ public static function getInfo() {
);
}
- function setUp() {
+ public function setUp() {
parent::setUp();
node_access_rebuild();
- variable_set('node_access_test_private', TRUE);
+ state()->set('node_access_test.private', TRUE);
}
/**
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
index 5ad396aa42d8..402409ad678e 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
@@ -36,7 +36,7 @@ public static function getInfo() {
function setUp() {
parent::setUp();
node_access_rebuild();
- variable_set('node_access_test_private', TRUE);
+ state()->set('node_access_test.private', TRUE);
}
/**
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
index a8e36b221a41..eb4524d19c0e 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
@@ -37,7 +37,7 @@ public function setUp() {
parent::setUp();
node_access_rebuild();
- variable_set('node_access_test_private', TRUE);
+ state()->set('node_access_test.private', TRUE);
}
/**
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 0fbbdc939316..33fe4d698e8d 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -33,7 +33,7 @@ function node_access_test_node_grants($account, $op) {
function node_access_test_node_access_records(Node $node) {
$grants = array();
// For NodeAccessBaseTableTestCase, only set records for private nodes.
- if (!variable_get('node_access_test_private') || $node->private) {
+ if (!state()->get('node_access_test.private') || $node->private) {
$grants[] = array(
'realm' => 'node_access_test',
'gid' => 8888,
@@ -180,7 +180,7 @@ function node_access_entity_test_page() {
*/
function node_access_test_form_node_form_alter(&$form, $form_state) {
// Only show this checkbox for NodeAccessBaseTableTestCase.
- if (variable_get('node_access_test_private')) {
+ if (state()->get('node_access_test.private')) {
$node = $form_state['controller']->getEntity($form_state);
$form['private'] = array(
'#type' => 'checkbox',
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
index 3a5efda4a05c..1aa144e70316 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
@@ -35,10 +35,9 @@ public static function getInfo() {
public function setUp() {
parent::setUp();
node_access_rebuild();
- variable_set('node_access_test_private', TRUE);
+ state()->set('node_access_test.private', TRUE);
}
-
/**
* Ensure private node on /tracker is only visible to users with permission.
*/
--
GitLab