diff --git modules/simpletest/tests/menu.test modules/simpletest/tests/menu.test index deafb29..1fbba7b 100644 --- modules/simpletest/tests/menu.test +++ modules/simpletest/tests/menu.test @@ -7,8 +7,8 @@ */ class MenuWebTestCase extends DrupalWebTestCase { - function setUp() { - parent::setUp(array('menu_test')); + function setUp($modules = array()) { + parent::setUp($modules); } /** @@ -928,7 +928,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase { } function setUp() { - parent::setUp(); + parent::setUp(array('menu_test')); $perms = array_keys(module_invoke_all('permission')); $this->admin_user = $this->drupalCreateUser($perms); $this->drupalLogin($this->admin_user); @@ -1418,9 +1418,8 @@ class MenuTrailTestCase extends MenuWebTestCase { } function setUp() { - parent::setUp(); - $perms = array_keys(module_invoke_all('permission')); - $this->admin_user = $this->drupalCreateUser($perms); + parent::setUp(array('menu_test')); + $this->admin_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages')); $this->drupalLogin($this->admin_user); // This test puts menu links in the Navigation menu and then tests for @@ -1455,10 +1454,11 @@ class MenuTrailTestCase extends MenuWebTestCase { */ function testMenuTreeSetPath() { $home = array('' => 'Home'); - $config = $home + array( + $config_tree = array( 'admin' => t('Administration'), 'admin/config' => t('Configuration'), ); + $config = $home + $config_tree; // The menu_test_menu_tree_set_path system variable controls whether or not // the menu_test_menu_trail_callback() callback (used by all paths in these @@ -1468,47 +1468,47 @@ class MenuTrailTestCase extends MenuWebTestCase { 'path' => 'admin/config/system/site-information', ); - $case1_breadcrumb = $home + array( + $breadcrumb = $home + array( 'menu-test' => t('Menu test root'), ); - $case1_tree = array( + $tree = array( 'menu-test' => t('Menu test root'), 'menu-test/menu-trail' => t('Menu trail - Case 1'), ); // Test the tree generation for the Navigation menu. variable_del('menu_test_menu_tree_set_path'); - $this->assertBreadcrumb('menu-test/menu-trail', $case1_breadcrumb, t('Menu trail - Case 1'), $case1_tree); + $this->assertBreadcrumb('menu-test/menu-trail', $breadcrumb, t('Menu trail - Case 1'), $tree); // Override the active trail for the Management tree; it should not affect // the Navigation tree. variable_set('menu_test_menu_tree_set_path', $test_menu_path); - $this->assertBreadcrumb('menu-test/menu-trail', $case1_breadcrumb, t('Menu trail - Case 1'), $case1_tree); + $this->assertBreadcrumb('menu-test/menu-trail', $breadcrumb, t('Menu trail - Case 1'), $tree); - $case2_breadcrumb = $config + array( + $breadcrumb = $config + array( 'admin/config/development' => t('Development'), ); - $case2_tree = $case2_breadcrumb + array( + $tree = $config_tree + array( + 'admin/config/development' => t('Development'), 'admin/config/development/menu-trail' => t('Menu trail - Case 2'), ); - $case2_override_breadcrumb = $config + array( + $override_breadcrumb = $config + array( + 'admin/config/system' => t('System'), + 'admin/config/system/site-information' => t('Site information'), + ); + $override_tree = $config_tree + array( 'admin/config/system' => t('System'), 'admin/config/system/site-information' => t('Site information'), ); - $case2_override_tree = $case2_override_breadcrumb; - - // Remove the Home link from the tree arrays. - array_shift($case2_tree); - array_shift($case2_override_tree); // Test the tree generation for the Management menu. variable_del('menu_test_menu_tree_set_path'); - $this->assertBreadcrumb('admin/config/development/menu-trail', $case2_breadcrumb, t('Menu trail - Case 2'), $case2_tree); + $this->assertBreadcrumb('admin/config/development/menu-trail', $breadcrumb, t('Menu trail - Case 2'), $tree); // Override the active trail for the Management tree; it should affect the // breadcrumbs and Management tree. variable_set('menu_test_menu_tree_set_path', $test_menu_path); - $this->assertBreadcrumb('admin/config/development/menu-trail', $case2_override_breadcrumb, t('Menu trail - Case 2'), $case2_override_tree); + $this->assertBreadcrumb('admin/config/development/menu-trail', $override_breadcrumb, t('Menu trail - Case 2'), $override_tree); } } diff --git modules/simpletest/tests/menu_test.module modules/simpletest/tests/menu_test.module index 82e17dc..9480e82 100644 --- modules/simpletest/tests/menu_test.module +++ modules/simpletest/tests/menu_test.module @@ -216,13 +216,13 @@ function menu_test_menu() { $items['menu-test/menu-trail'] = array( 'title' => 'Menu trail - Case 1', 'page callback' => 'menu_test_menu_trail_callback', - 'access arguments' => array('administer site configuration'), + 'access arguments' => array('access content'), ); $items['admin/config/development/menu-trail'] = array( 'title' => 'Menu trail - Case 2', 'description' => 'Tests menu_tree_set_path()', 'page callback' => 'menu_test_menu_trail_callback', - 'access arguments' => array('administer site configuration'), + 'access arguments' => array('access administration pages'), ); // File inheritance tests. This menu item should inherit the page callback