Merge pull request #301 from owncloud/keep-error-message-in-the-session

Keep error message in the session

6 files changed, 68 insertions, 19 deletions

diff --git a/tests/unit/controller/FilesApiControllerTest.php b/tests/unit/controller/FilesApiControllerTest.php
index e53d179e..3d837b79 100644
--- a/tests/unit/controller/FilesApiControllerTest.php
+++ b/tests/unit/controller/FilesApiControllerTest.php
@@ -31,6 +31,7 @@ class FilesApiControllerTest extends FilesControllerTest {
 			$this->configService,
 			$this->searchMediaService,
 			$this->downloadService,
+			$this->session,
 			$this->logger
 		);
 	}
diff --git a/tests/unit/controller/FilesControllerTest.php b/tests/unit/controller/FilesControllerTest.php
index 853487a6..5b202b08 100644
--- a/tests/unit/controller/FilesControllerTest.php
+++ b/tests/unit/controller/FilesControllerTest.php
@@ -15,6 +15,7 @@ namespace OCA\Gallery\Controller;
 use OCA\Gallery\Service\ServiceException;
 use OCP\IRequest;
 use OCP\IURLGenerator;
+use OCP\ISession;
 use OCP\ILogger;
 
 use OCP\AppFramework\IAppContainer;
@@ -57,6 +58,10 @@ class FilesControllerTest extends \Test\GalleryUnitTest {
 	protected $searchMediaService;
 	/** @var DownloadService */
 	protected $downloadService;
+	/** @var ISession */
+	protected $session;
+	/** @var ISession */
+	protected $sessionValue = null;
 	/** @var ILogger */
 	protected $logger;
 
@@ -90,6 +95,9 @@ class FilesControllerTest extends \Test\GalleryUnitTest {
 		$this->downloadService = $this->getMockBuilder('\OCA\Gallery\Service\DownloadService')
 									  ->disableOriginalConstructor()
 									  ->getMock();
+		$this->session = $this->getMockBuilder('\OCP\ISession')
+							  ->disableOriginalConstructor()
+							  ->getMock();
 		$this->logger = $this->getMockBuilder('\OCP\ILogger')
 							 ->disableOriginalConstructor()
 							 ->getMock();
@@ -101,6 +109,7 @@ class FilesControllerTest extends \Test\GalleryUnitTest {
 			$this->configService,
 			$this->searchMediaService,
 			$this->downloadService,
+			$this->session,
 			$this->logger
 		);
 	}
@@ -356,4 +365,20 @@ class FilesControllerTest extends \Test\GalleryUnitTest {
 								 )
 								 ->willReturn($answer);
 	}
+
+	/**
+	 * Needs to be called at least once by testDownloadWithWrongId() or the tests will fail
+	 *
+	 * @param $key
+	 * @param $value
+	 */
+	private function mockSessionSet($key, $value) {
+		$this->session->expects($this->once())
+					  ->method('set')
+					  ->with(
+						  $key,
+						  $value
+					  );
+	}
+
 }
diff --git a/tests/unit/controller/FilesPublicControllerTest.php b/tests/unit/controller/FilesPublicControllerTest.php
index 1253018b..400f355e 100644
--- a/tests/unit/controller/FilesPublicControllerTest.php
+++ b/tests/unit/controller/FilesPublicControllerTest.php
@@ -13,6 +13,7 @@
 namespace OCA\Gallery\Controller;
 
 require_once __DIR__ . '/FilesControllerTest.php';
+
 /**
  * Class FilesPublicControllerTest
  *
@@ -30,6 +31,7 @@ class FilesPublicControllerTest extends FilesControllerTest {
 			$this->configService,
 			$this->searchMediaService,
 			$this->downloadService,
+			$this->session,
 			$this->logger
 		);
 	}
diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php
index cf71d729..0189dfff 100644
--- a/tests/unit/controller/PageControllerTest.php
+++ b/tests/unit/controller/PageControllerTest.php
@@ -12,17 +12,16 @@
 
 namespace OCA\Gallery\Controller;
 
-
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IURLGenerator;
+use OCP\ISession;
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 
 use OCA\Gallery\Environment\Environment;
-use OCA\Gallery\Service\DownloadService;
 
 /**
  * @package OCA\Gallery\Controller
@@ -39,6 +38,8 @@ class PageControllerTest extends \Test\TestCase {
 	private $urlGenerator;
 	/** @var IConfig */
 	private $appConfig;
+	/** @var ISession */
+	protected $session;
 	/** @var PageController */
 	protected $controller;
 
@@ -60,12 +61,16 @@ class PageControllerTest extends \Test\TestCase {
 		$this->appConfig = $this->getMockBuilder('\OCP\IConfig')
 								->disableOriginalConstructor()
 								->getMock();
+		$this->session = $this->getMockBuilder('\OCP\ISession')
+							  ->disableOriginalConstructor()
+							  ->getMock();
 		$this->controller = new PageController(
 			$this->appName,
 			$this->request,
 			$this->environment,
 			$this->urlGenerator,
-			$this->appConfig
+			$this->appConfig,
+			$this->session
 		);
 	}
 
@@ -167,8 +172,9 @@ class PageControllerTest extends \Test\TestCase {
 		];
 		$template = new TemplateResponse($this->appName, 'index', $params, 'guest');
 		$template->setStatus($code);
+		$this->mockSessionGet('galleryErrorMessage', $message);
 
-		$response = $this->controller->errorPage($message, $code);
+		$response = $this->controller->errorPage($code);
 
 		$this->assertEquals($params, $response->getParams());
 		$this->assertEquals('index', $response->getTemplateName());
@@ -233,4 +239,17 @@ class PageControllerTest extends \Test\TestCase {
 						   ->willReturn($url);
 	}
 
+	/**
+	 * Needs to be called at least once by testDownloadWithWrongId() or the tests will fail
+	 *
+	 * @param $key
+	 * @param $value
+	 */
+	private function mockSessionGet($key, $value) {
+		$this->session->expects($this->once())
+					  ->method('get')
+					  ->with($key)
+					  ->willReturn($value);
+	}
+
 }
diff --git a/tests/unit/middleware/EnvCheckMiddlewareTest.php b/tests/unit/middleware/EnvCheckMiddlewareTest.php
index cb57481c..7f37ac65 100644
--- a/tests/unit/middleware/EnvCheckMiddlewareTest.php
+++ b/tests/unit/middleware/EnvCheckMiddlewareTest.php
@@ -44,9 +44,9 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 	private $appName = 'gallery';
 	/** @var IRequest */
 	private $request;
-	/** @var IHasher    * */
+	/** @var IHasher */
 	private $hasher;
-	/** @var ISession     * */
+	/** @var ISession */
 	private $session;
 	/** @var Environment */
 	private $environment;
@@ -165,7 +165,9 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 	public function testBeforeControllerWithPublicNotationAndToken() {
 		$this->reflector->reflect(__CLASS__, __FUNCTION__);
 
-		$this->mockGetTokenAndPasswordParams($this->sharedFolderToken, $this->passwordForFolderShare);
+		$this->mockGetTokenAndPasswordParams(
+			$this->sharedFolderToken, $this->passwordForFolderShare
+		);
 		$linkItem = Share::getShareByToken($this->sharedFolderToken, false);
 
 		$this->mockHasherVerify($this->passwordForFolderShare, $linkItem['share_with'], true);
@@ -461,7 +463,7 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 		$code = Http::STATUS_NOT_FOUND;
 		$exception = new CheckException($message, $code);
 
-		$template = $this->mockHtml404Response($message, $code);
+		$template = $this->mockHtml404Response($code);
 
 		$response =
 			$this->middleware->afterException($this->controller, 'authenticate', $exception);
@@ -542,10 +544,10 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 		return new TemplateResponse($this->appName, 'authenticate', [], 'guest');
 	}
 
-	private function mockHtml404Response($message, $code) {
+	private function mockHtml404Response($code) {
 		$this->mockAcceptHeader('html');
 		$redirectUrl = 'http://newroute.com';
-		$this->mockUrlToErrorPage($message, $code, $redirectUrl);
+		$this->mockUrlToErrorPage($code, $redirectUrl);
 
 		return new RedirectResponse($redirectUrl);
 	}
@@ -584,20 +586,13 @@ class EnvCheckMiddlewareTest extends \Codeception\TestCase\Test {
 	/**
 	 * Mocks IURLGenerator->linkToRoute()
 	 *
-	 * @param string $message
 	 * @param int $code
 	 * @param string $url
 	 */
-	private function mockUrlToErrorPage($message, $code, $url) {
+	private function mockUrlToErrorPage($code, $url) {
 		$this->urlGenerator->expects($this->once())
 						   ->method('linkToRoute')
-						   ->with(
-							   $this->appName . '.page.error_page',
-							   [
-								   'message' => $message,
-								   'code'    => $code
-							   ]
-						   )
+						   ->with($this->appName . '.page.error_page', ['code' => $code])
 						   ->willReturn($url);
 	}
 
diff --git a/tests/unit/middleware/SharingCheckMiddlewareTest.php b/tests/unit/middleware/SharingCheckMiddlewareTest.php
index ff3b31b3..a798fe6b 100644
--- a/tests/unit/middleware/SharingCheckMiddlewareTest.php
+++ b/tests/unit/middleware/SharingCheckMiddlewareTest.php
@@ -21,6 +21,7 @@ use OCP\IConfig;
 use OCP\IRequest;
 use OCP\ILogger;
 use OCP\IURLGenerator;
+use OCP\ISession;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -44,6 +45,8 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 	protected $reflector;
 	/** @var IURLGenerator */
 	private $urlGenerator;
+	/** @var ISession */
+	private $session;
 	/** @var ILogger */
 	protected $logger;
 	/** @var Controller */
@@ -68,6 +71,9 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
 								   ->disableOriginalConstructor()
 								   ->getMock();
+		$this->session = $this->getMockBuilder('\OCP\ISession')
+							  ->disableOriginalConstructor()
+							  ->getMock();
 		$this->logger = $this->getMockBuilder('\OCP\ILogger')
 							 ->disableOriginalConstructor()
 							 ->getMock();
@@ -81,6 +87,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			$this->config,
 			$this->reflector,
 			$this->urlGenerator,
+			$this->session,
 			$this->logger
 		);
 	}