Issue #1814402 by Lars Toomre, moe4715: Convert 'node_access_test_private()' variable to state() system.

8.0.x
catch 2012-11-09 20:13:44 +00:00
parent b193399708
commit 1a0793dad4
5 changed files with 7 additions and 8 deletions

View File

@ -27,10 +27,10 @@ class FilePrivateTest extends FileFieldTestBase {
);
}
function setUp() {
public function setUp() {
parent::setUp();
node_access_rebuild();
variable_set('node_access_test_private', TRUE);
state()->set('node_access_test.private', TRUE);
}
/**

View File

@ -36,7 +36,7 @@ class ForumNodeAccessTest extends WebTestBase {
function setUp() {
parent::setUp();
node_access_rebuild();
variable_set('node_access_test_private', TRUE);
state()->set('node_access_test.private', TRUE);
}
/**

View File

@ -37,7 +37,7 @@ class NodeAccessBaseTableTest extends NodeTestBase {
parent::setUp();
node_access_rebuild();
variable_set('node_access_test_private', TRUE);
state()->set('node_access_test.private', TRUE);
}
/**

View File

@ -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',

View File

@ -35,10 +35,9 @@ class TrackerNodeAccessTest extends WebTestBase {
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.
*/