Merge branch 'MAGETWO-51575' of https://github.com/magento-falcons/magento2ce into MAGETWO-57201

shiftedreality · shiftedreality · commit 48aa339094a5 · 2016-08-23T17:42:04.000+03:00
diff --git a/setup/src/Magento/Setup/Controller/CompleteBackup.php b/setup/src/Magento/Setup/Controller/CompleteBackup.php
@@ -18,8 +18,8 @@ class CompleteBackup extends AbstractActionController
     public function indexAction()
     {
         $view = new ViewModel;
-        $view->setTerminal(true);
-        $view->setTemplate('/magento/setup/complete-backup.phtml');
+        $view->setTemplate('/error/404.phtml');
+        $this->getResponse()->setStatusCode(\Zend\Http\Response::STATUS_CODE_404);
         return $view;
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/CompleteBackupTest.php
@@ -26,8 +26,11 @@ public function testIndexAction()
     {
         $viewModel = $this->controller->indexAction();
         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
-        $this->assertTrue($viewModel->terminate());
-        $this->assertSame('/magento/setup/complete-backup.phtml', $viewModel->getTemplate());
+        $this->assertSame('/error/404.phtml', $viewModel->getTemplate());
+        $this->assertSame(
+            \Zend\Http\Response::STATUS_CODE_404,
+            $this->controller->getResponse()->getStatusCode()
+        );
     }
 
     public function testProgressAction()

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ class CompleteBackup extends AbstractActionController`
`18`	`18`	`public function indexAction()`
`19`	`19`	`{`
`20`	`20`	`$view = new ViewModel;`
`21`		`- $view->setTerminal(true);`
`22`		`- $view->setTemplate('/magento/setup/complete-backup.phtml');`
	`21`	`+ $view->setTemplate('/error/404.phtml');`
	`22`	`+ $this->getResponse()->setStatusCode(\Zend\Http\Response::STATUS_CODE_404);`
`23`	`23`	`return $view;`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,11 @@ public function testIndexAction()`
`26`	`26`	`{`
`27`	`27`	`$viewModel = $this->controller->indexAction();`
`28`	`28`	`$this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);`
`29`		`- $this->assertTrue($viewModel->terminate());`
`30`		`- $this->assertSame('/magento/setup/complete-backup.phtml', $viewModel->getTemplate());`
	`29`	`+ $this->assertSame('/error/404.phtml', $viewModel->getTemplate());`
	`30`	`+ $this->assertSame(`
	`31`	`+ \Zend\Http\Response::STATUS_CODE_404,`
	`32`	`+ $this->controller->getResponse()->getStatusCode()`
	`33`	`+ );`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`public function testProgressAction()`