! Update tests

elkarte · Sep 28, 2022 · cb51523 · cb51523
1 parent 0495945
commit cb51523
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/sources/ElkArte/Menu/Menu.php b/sources/ElkArte/Menu/Menu.php
@@ -729,10 +729,15 @@ public function prepareTabData($tabArray = [])
 	{
 		global $context;
 
-		$currentArea = $this->menuContext['sections'][$this->menuContext['current_section']]['areas'][$this->currentArea];
+		$tabBuilder = new MenuTabs($this->menuContext['current_area'] ?? '', $this->currentSubaction ?? '');
+
+		$currentArea = '';
+		if (!empty($this->menuContext['sections']))
+		{
+			$currentArea = $this->menuContext['sections'][$this->menuContext['current_section']]['areas'][$this->currentArea];
+		}
 
 		// Build out the tab title/description area
-		$tabBuilder = new MenuTabs($this->menuContext['current_area'], $this->currentSubaction);
 		$tabBuilder
 			->setDescription($tabArray['description'] ?? '')
 			->setTitle($tabArray['title'] ?? '')

diff --git a/tests/sources/admin/PackagesTest.php b/tests/sources/admin/PackagesTest.php
@@ -3,6 +3,7 @@
 use ElkArte\EventManager;
 use ElkArte\HttpReq;
 use ElkArte\Languages\Loader;
+use ElkArte\Menu\Menu;
 use ElkArte\Packages\Packages;
 use ElkArte\Packages\PackageServers;
 use ElkArte\User;
@@ -37,8 +38,10 @@ protected function setUp(): void
 		$lang = new Loader('english', $txt, database());
 		$lang->load('Packages');
 
+		// Initialize a menu object
 		$context['admin_menu_id'] = 1;
 		$context['admin_menu_name'] = 'menu_data_' . $context['admin_menu_id'];
+		$context['menu_data_1']['object'] = new Menu();
 	}
 
 	/**

diff --git a/tests/sources/controllers/DraftTest.php b/tests/sources/controllers/DraftTest.php
@@ -2,6 +2,7 @@
 
 use ElkArte\Controller\Draft;
 use ElkArte\EventManager;
+use ElkArte\Menu\Menu;
 use ElkArte\User;
 use ElkArte\Languages\Loader;
 
@@ -37,7 +38,7 @@ public function testActionShowProfileDrafts()
 		global $context;
 
 		$context['profile_menu_name'] = 'profile_menu';
-		$context['profile_menu']['tab_data'] = [];
+		$context['profile_menu']['object'] = new Menu();
 
 		// Get the controller, call draft listing the long way
 		$controller = new Draft(new EventManager());

diff --git a/tests/sources/controllers/LikeTest.php b/tests/sources/controllers/LikeTest.php
@@ -3,6 +3,7 @@
 use ElkArte\Controller\Likes;
 use ElkArte\EventManager;
 use ElkArte\HttpReq;
+use ElkArte\Menu\Menu;
 use ElkArte\User;
 use ElkArte\Languages\Loader;
 
@@ -34,7 +35,9 @@ public function testShowLikes()
 		global $context, $modSettings;
 
 		$modSettings['likes_enabled'] = 1;
-		$context['profile_menu_name'] = 'menu_data_view_likes';
+		$context['profile_menu_name'] = 'menu_data_1';
+		$context['menu_data_1']['object'] = new Menu();
+
 		require_once(SUBSDIR . '/Profile.subs.php');
 
 		$controller = new Likes(new EventManager());
@@ -43,7 +46,7 @@ public function testShowLikes()
 		$controller->action_showProfileLikes();
 
 		// Lets see some items loaded into context, as createlist will have run
-		$this->assertEquals('Likes', $context['menu_data_view_likes']['tab_data']['title']);
+		$this->assertEquals('Likes', $context['menu_data_1']['tab_data']['title']);
 		$this->assertEquals(4, $context['view_likes']['num_columns']);
 		$this->assertEquals('Likes', $context['view_likes']['title']);
 	}

diff --git a/tests/sources/controllers/ProfileOptionsTest.php b/tests/sources/controllers/ProfileOptionsTest.php
@@ -3,6 +3,7 @@
 use ElkArte\Controller\ProfileOptions;
 use ElkArte\EventManager;
 use ElkArte\MembersList;
+use ElkArte\Menu\Menu;
 use ElkArte\User;
 use ElkArte\Languages\Loader;
 
@@ -122,6 +123,7 @@ public function testNotification()
 		$context['profile-u1_token_var'] = 'profile-u1';
 		$context['profile-u1_token'] = 'profile-u1';
 		$context['profile_menu_name'] = 'menu_data_1';
+		$context['menu_data_1']['object'] = new Menu();
 
 		$controller = new ProfileOptions(new EventManager());
 		$controller->setUser(User::$info);