Update json response testing

Author: iMattPro

controller/admin_controller.php

@@ -377,30 +377,20 @@ protected function get_submitted_action()
 	protected function ad_enable($enable)
 	{
 		$ad_id = $this->request->variable('id', 0);
+		$success = $this->manager->update_ad($ad_id, ['ad_enabled' => (int) $enable]);
 
-		$success = $this->manager->update_ad($ad_id, array(
-			'ad_enabled' => (int) $enable,
-		));
-
-		if ($success)
+		if ($success && $this->request->is_ajax())
 		{
-			if ($this->request->is_ajax())
-			{
-				$json_response = new \phpbb\json_response;
-				$json_response->send(array(
-					'text'  => $this->language->lang($enable ? 'ENABLED' : 'DISABLED'),
-					'title' => $this->language->lang('AD_ENABLE_TITLE', (int) $enable),
-				));
-			}
-			else
-			{
-				$this->success($enable ? 'ACP_AD_ENABLE_SUCCESS' : 'ACP_AD_DISABLE_SUCCESS');
-			}
+			$json_response = new \phpbb\json_response;
+			$json_response->send([
+				'text'  => $this->language->lang($enable ? 'ENABLED' : 'DISABLED'),
+				'title' => $this->language->lang('AD_ENABLE_TITLE', (int) $enable),
+			]);
 		}
-		else
-		{
+
+		$success ?
+			$this->success($enable ? 'ACP_AD_ENABLE_SUCCESS' : 'ACP_AD_DISABLE_SUCCESS') :
 			$this->error($enable ? 'ACP_AD_ENABLE_ERRORED' : 'ACP_AD_DISABLE_ERRORED');
-		}
 	}
 
 	/**

tests/controller/admin_controller_test.php

@@ -936,6 +936,7 @@ public function test_ad_enable($ad_id, $enable, $is_ajax, $err_msg)
 		if ($is_ajax)
 		{
 			$this->expectOutputString('{"text":"' . ($enable ? 'Enabled' : 'Disabled') . '","title":"AD_ENABLE_TITLE"}');
+			$this->expectException(\RuntimeException::class);
 		}
 		else
 		{

tests/controller/admin_input_test.php

@@ -249,6 +249,7 @@ public function test_banner_upload($can_create_directory, $can_move_file, $is_aj
 		{
 			$text = !empty($file_error) ? '"CANNOT_CREATE_DIRECTORY"' : '"' . addcslashes(trim(substr($ad_code_expected, strpos($ad_code_expected, '<img'))), "/\"") . '"';
 			$this->expectOutputString('{"success":' . (count($file_error) ? 'false' : 'true') . ',"title":"Information","text":' . $text . '}');
+			$this->expectException(\RuntimeException::class);
 		}
 
 		$result = $input_controller->banner_upload($ad_code);