diff options
| -rw-r--r-- | modules/simpletest/tests/menu.test | 4 | ||||
| -rw-r--r-- | profiles/default/default.install | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index d8ac5a882..51d08700b 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -157,7 +157,9 @@ class MenuIncTestCase extends DrupalWebTestCase { * Test menu_get_names(). */ function testMenuGetNames() { - $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'main-menu', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.')); + // The main-menu is there but has no items by default, so not returned by + // menu_get_names(). Therefore we cannot check for that. + $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.')); } /** diff --git a/profiles/default/default.install b/profiles/default/default.install index c4268dac7..8831f5435 100644 --- a/profiles/default/default.install +++ b/profiles/default/default.install @@ -205,10 +205,6 @@ function default_install() { // Update the menu router information. menu_rebuild(); - // Save some default links. - $link = array('link_path' => 'admin/structure/menu/manage/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu'); - menu_link_save($link); - // Enable the admin theme. db_update('system') ->fields(array('status' => 1)) |