Removing tool_navigation_menu.inc.php file now we load it in the template.lib.php file

skala
Julio Montoya 13 years ago
parent 0dce16f97d
commit c9c3d7bc5e
  1. 13
      main/chat/chat_hidden.php
  2. 33
      tests/main/inc/tool_navigation_menu.inc.test.php
  3. 1
      tests/test_manager.inc.php
  4. 3
      tests/test_suite.php

@ -97,19 +97,6 @@ list($connected_new) = Database::fetch_row($result);
/*disconnected user of chat*/
disconnect_user_of_chat ();
require 'header_frame.inc.php';
// Navigation menu
if (api_get_setting('show_navigation_menu') != 'false') {
$course_id = api_get_course_id();
if (!empty($course_id) && ($course_id != -1)) {
if (api_get_setting('show_navigation_menu') != 'icons') {
echo '</div> <!-- end #center -->';
echo '</div> <!-- end #centerwrap -->';
}
require_once api_get_path(INCLUDE_PATH).'tool_navigation_menu.inc.php';
show_navigation_menu();
}
}
?>
<form name="formHidden" method="post" action="<?php echo api_get_self().'?cidReq='.$_GET['cidReq']; ?>">
<input type="hidden" name="chat_size_old" value="<?php echo $chat_size_new; ?>">

@ -1,33 +0,0 @@
<?php
class TestToolNavigationMenu extends UnitTestCase{
public function TestToolNavigationMenu(){
$this->UnitTestCase('Navigation menu display library - main/inc/tool_navigation_menu.inc.test.php');
}
public function testGetNavigationItemsIsArray() {
global $is_courseMember;
global $_user;
global $_course;
$include_admin_tools = false;
$res = get_navigation_items($include_admin_tools);
$this->assertTrue(is_array($res));
}
public function testShowNavigationMenuIsNull() {
ob_start();
$navigation_items = get_navigation_items(true);
$course_id = api_get_course_id();
$res = show_navigation_menu();
$this->assertNull($res);
ob_end_clean();
}
public function testShowNavigationToolShortcutsIsNull() {
ob_start();
$orientation = SHORTCUTS_HORIZONTAL;
$res = show_navigation_tool_shortcuts($orientation);
$this->assertNull($res);
ob_end_clean();
}
}

@ -82,7 +82,6 @@ require_once $libdir.'main_api.lib.php';
require_once $libdir.'course_document.lib.php';
require_once $libdir.'banner.lib.php';
require_once $libdir.'add_course.lib.inc.php';
require_once $incdir.'tool_navigation_menu.inc.php';
require_once $incdir.'banner.inc.php';
require_once $libdir.'geometry.lib.php';
ob_end_clean();

@ -99,8 +99,7 @@ class TestsSuite extends TestSuite {
//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/blog.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/urlmanager.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/stats.lib.inc.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/tool_navigation_menu.inc.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/course_document.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/display.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/document.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/inc/lib/events.lib.inc.test.php');

Loading…
Cancel
Save