Fix tests

Author: rubencm

controller/admin_input.php

@@ -41,11 +41,12 @@ class admin_input
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\user              $user        User object
-	 * @param \phpbb\user_loader       $user_loader User loader object
-	 * @param \phpbb\language\language $language    Language object
-	 * @param \phpbb\request\request   $request     Request object
-	 * @param \phpbb\ads\banner\banner $banner      Banner upload object
+	 * @param \phpbb\controller\helper $controller_helper Controller helper object
+	 * @param \phpbb\user              $user              User object
+	 * @param \phpbb\user_loader       $user_loader       User loader object
+	 * @param \phpbb\language\language $language          Language object
+	 * @param \phpbb\request\request   $request           Request object
+	 * @param \phpbb\ads\banner\banner $banner            Banner upload object
 	 */
 	public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\user $user, \phpbb\user_loader $user_loader, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\ads\banner\banner $banner)
 	{

migrations/v30x/m1_storage.php

@@ -56,12 +56,13 @@ public function migrate_ads_storage()
 		/** @var file_tracker $file_tracker */
 		$file_tracker = $this->container->get('storage.file_tracker');
 
-		if (!$filesystem->exists($this->phpbb_root_path . 'images/phpbb_ads'))
+		$dir = $this->phpbb_root_path . 'images/phpbb_ads';
+
+		if (!$filesystem->exists($dir))
 		{
-			$filesystem->mkdir($this->phpbb_root_path . 'images/phpbb_ads');
+			$filesystem->mkdir($dir);
 		}
 
-		$dir = $this->phpbb_root_path . 'images/phpbb_ads';
 		$handle = @opendir($dir);
 
 		if ($handle)
@@ -73,7 +74,7 @@ public function migrate_ads_storage()
 					continue;
 				}
 
-				$file_tracker->track_file('phpbb_ads', $file, filesize($this->phpbb_root_path . 'images/phpbb_ads/' . $file));
+				$file_tracker->track_file('phpbb_ads', $file, filesize($dir . '/' . $file));
 			}
 
 			closedir($handle);

tests/banner/banner_base.php

@@ -15,14 +15,12 @@ class banner_base extends \phpbb_test_case
 	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\files\upload */
 	protected $files_upload;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\filesystem\filesystem */
-	protected $filesystem;
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\files\filespec_storage */
+	protected $file;
 
-	/** @var string */
-	protected $root_path;
+	/** @var \phpbb\storage\storage */
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\files\filespec */
-	protected $file;
+	protected $storage;
 
 	protected static function setup_extensions()
 	{
@@ -36,16 +34,12 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		global $phpbb_root_path;
-
 		$this->files_upload = $this->getMockBuilder('\phpbb\files\upload')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->filesystem = $this->getMockBuilder('\phpbb\filesystem\filesystem')
+		$this->storage = $this->getMockBuilder('\phpbb\storage\storage')
 			->disableOriginalConstructor()
 			->getMock();
-
-		$this->root_path = $phpbb_root_path;
 	}
 
 	/**
@@ -57,8 +51,7 @@ public function get_manager()
 	{
 		return new \phpbb\ads\banner\banner(
 			$this->files_upload,
-			$this->filesystem,
-			$this->root_path
+			$this->storage
 		);
 	}
 }

tests/banner/create_storage_dir_test.php

@@ -20,13 +20,14 @@ public function test_remove()
 		$manager = $this->get_manager();
 
 		// Mock filespec
-		$file = $this->getMockBuilder('\phpbb\files\filespec')
+		$file = $this->getMockBuilder('\phpbb\files\filespec_storage')
 			->disableOriginalConstructor()
 			->getMock();
 		$manager->set_file($file);
 
 		$file->expects(self::once())
-			->method('remove');
+			->method('remove')
+			->with($this->storage);
 
 		$manager->remove();
 	}

tests/banner/remove_test.php

@@ -42,7 +42,7 @@ public function test_upload($file_move_success)
 			->with(array('gif', 'jpg', 'jpeg', 'png'));
 
 		// Mock filespec
-		$file = $this->getMockBuilder('\phpbb\files\filespec')
+		$file = $this->getMockBuilder('\phpbb\files\filespec_storage')
 			->disableOriginalConstructor()
 			->getMock();
 		if (!$file_move_success)
@@ -52,7 +52,7 @@ public function test_upload($file_move_success)
 
 		$this->files_upload->expects(self::once())
 			->method('handle_upload')
-			->with('files.types.form', 'banner')
+			->with('files.types.form_storage', 'banner')
 			->willReturn($file);
 
 		$file->expects(self::once())
@@ -61,7 +61,7 @@ public function test_upload($file_move_success)
 
 		$file->expects(self::once())
 			->method('move_file')
-			->with('images/phpbb_ads')
+			->with($this->storage)
 			->willReturn($file_move_success);
 
 		if (!$file_move_success)

tests/banner/upload_test.php

@@ -15,6 +15,9 @@ class admin_input_test extends \phpbb_database_test_case
 	/** @var bool A return value for check_form_key() */
 	public static $valid_form = true;
 
+	/** @var \phpbb\controller\helper */
+	protected $controller_helper;
+
 	/** @var \phpbb\user */
 	protected $user;
 
@@ -60,6 +63,9 @@ protected function setUp(): void
 
 		// Load/Mock classes required by the controller class
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+		$this->controller_helper = $this->getMockBuilder('\phpbb\controller\helper')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->user = $user = new \phpbb\user($this->language, '\phpbb\datetime');
 		$this->user->timezone = new \DateTimeZone('UTC');
 		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
@@ -92,6 +98,7 @@ protected function setUp(): void
 	public function get_input_controller()
 	{
 		$input = new \phpbb\ads\controller\admin_input(
+			$this->controller_helper,
 			$this->user,
 			$this->user_loader,
 			$this->language,
@@ -210,24 +217,15 @@ public function test_banner_upload($can_create_directory, $can_move_file, $is_aj
 	{
 		$input_controller = $this->get_input_controller();
 
-		$create_storage_dir = $this->banner->expects(self::once())
-			->method('create_storage_dir');
-		if (!$can_create_directory)
+		$upload = $this->banner->expects(self::once())
+			->method('upload');
+		if (!$can_move_file)
 		{
-			$create_storage_dir->willThrowException(new \phpbb\exception\runtime_exception('CANNOT_CREATE_DIRECTORY'));
+			$upload->willThrowException(new \phpbb\exception\runtime_exception('FILE_MOVE_UNSUCCESSFUL'));
 		}
 		else
 		{
-			$upload = $this->banner->expects(self::once())
-				->method('upload');
-			if (!$can_move_file)
-			{
-				$upload->willThrowException(new \phpbb\exception\runtime_exception('FILE_MOVE_UNSUCCESSFUL'));
-			}
-			else
-			{
-				$upload->willReturn('abcdef.jpg');
-			}
+			$upload->willReturn('abcdef.jpg');
 		}
 
 		if (!$can_create_directory || !$can_move_file)
@@ -236,6 +234,9 @@ public function test_banner_upload($can_create_directory, $can_move_file, $is_aj
 				->method('remove');
 		}
 
+		$this->controller_helper->method('route')
+			->willReturn('/images/phpbb_ads/abcdef.jpg');
+
 		$this->request->expects(self::once())
 			->method('is_ajax')
 			->willReturn($is_ajax);