Merge pull request #181 from iMattPro/updates

Updates

Author: iMattPro

acp/main_module.php

@@ -40,7 +40,7 @@ public function main($id, $mode)
 		$this->tpl_name = $mode . '_ads';
 
 		// Set the page title for our ACP page
-		$this->page_title = $admin_controller->get_page_title();
+		$this->page_title = 'ACP_PHPBB_ADS_TITLE';
 
 		$admin_controller->{'mode_' . $mode}();
 	}

controller/admin_controller.php

@@ -108,16 +108,6 @@ public function set_page_url($u_action)
 		$this->u_action = $u_action;
 	}
 
-	/**
-	 * Get ACP page title for Ads module
-	 *
-	 * @return	string	Language string for Ads ACP module
-	 */
-	public function get_page_title()
-	{
-		return $this->language->lang('ACP_PHPBB_ADS_TITLE');
-	}
-
 	/**
 	 * Process user request for settings mode
 	 *

controller/ucp_controller.php

@@ -64,14 +64,6 @@ public function set_page_url($u_action)
 		$this->u_action = $u_action;
 	}
 
-	/**
-	 * @return	string	Module language string
-	 */
-	public function get_page_title()
-	{
-		return $this->language->lang('UCP_PHPBB_ADS_STATS');
-	}
-
 	/**
 	 * Display UCP ads module
 	 */

tests/controller/admin_controller_test.php

@@ -154,15 +154,6 @@ public function get_controller()
 		return $controller;
 	}
 
-	/**
-	 * Test get_page_title() method
-	 */
-	public function test_get_page_title()
-	{
-		$controller = $this->get_controller();
-		self::assertEquals($controller->get_page_title(), $this->language->lang('ACP_PHPBB_ADS_TITLE'));
-	}
-
 	/**
 	 * Test mode_settings()
 	 */

tests/controller/admin_input_test.php

@@ -115,6 +115,7 @@ public function get_form_data_data()
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '', 'blah', 5, 0, 0, 0, '', [], false], 0, ['AD_END_DATE_INVALID']),
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '1970-01-01', '', 5, 0, 0, 0, '', [], false], 0, ['AD_START_DATE_INVALID']),
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '', '1970-01-01', 5, 0, 0, 0, '', [], false], 0, ['AD_END_DATE_INVALID']),
+			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '2060-01-01', '2050-01-01', 5, 0, 0, 0, '', [], false], 0, ['END_DATE_TOO_SOON']),
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '', '', 0, 0, 0, 0, '', [], false], 0, ['AD_PRIORITY_INVALID']),
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '', '', 11, 0, 0, 0, '', [], false], 0, ['AD_PRIORITY_INVALID']),
 			array(true, ['Ad Name #1', 'Ad Note #1', 'Ad Code #1', 0, '', '', '', 5, 0, -1, 0, '', [], false], 0, ['AD_VIEWS_LIMIT_INVALID']),

tests/controller/ucp_controller_test.php

@@ -101,16 +101,6 @@ public function get_controller()
 		return $controller;
 	}
 
-	/**
-	 * Test get_page_title() method
-	 */
-	public function test_get_page_title()
-	{
-		$controller = $this->get_controller();
-
-		self::assertEquals($this->language->lang('UCP_PHPBB_ADS_STATS'), $controller->get_page_title());
-	}
-
 	/**
 	 * Test data for the test_main() function
 	 *
@@ -153,6 +143,17 @@ public function main_data()
 					'ad_views_limit'	=> 0,
 					'ad_clicks_limit'	=> 0,
 				),
+				array(
+					'ad_id'				=> 4,
+					'ad_name'			=> 'Fourth ad',
+					'ad_views'			=> 0,
+					'ad_clicks'			=> 0,
+					'ad_enabled'		=> 1,
+					'ad_start_date'		=> 0,
+					'ad_end_date'		=> 1,
+					'ad_views_limit'	=> 0,
+					'ad_clicks_limit'	=> 0,
+				),
 			)),
 			array(1, 0, array()),
 			array(0, 1, array()),
@@ -175,6 +176,10 @@ public function test_main($enable_views, $enable_clicks, $ads)
 			->method('get_ads_by_owner')
 			->willReturn($ads);
 
+		$this->helper->expects(self::exactly(count($ads)))
+			->method('is_expired')
+			->willReturnOnConsecutiveCalls(false, false, false, true);
+
 		$this->template->expects(self::exactly(count($ads)))
 			->method('assign_block_vars');
 

tests/ucp/ucp_module_test.php

@@ -111,10 +111,6 @@ public function test_main_module()
 			->expects(self::once())
 			->method('set_page_url');
 
-		$ucp_controller
-			->expects(self::once())
-			->method('get_page_title');
-
 		$ucp_controller
 			->expects(self::once())
 			->method('main');

ucp/main_module.php

@@ -38,7 +38,7 @@ public function main()
 		$this->tpl_name = 'ucp_ads_stats';
 
 		// Set the page title for our UCP page
-		$this->page_title = $ucp_controller->get_page_title();
+		$this->page_title = 'UCP_PHPBB_ADS_STATS';
 
 		$ucp_controller->main();
 	}