MAGETWO-34993: Refactor controllers from the list (Part1)

Author: Yurii Torbyk

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php

@@ -192,7 +192,30 @@ public function testIsLoggedIn()
         $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->execute());
     }
 
+    public function testGetDefaultRedirect()
+    {
+        $testUrl = 'http://example.com';
+        $this->urlMock->expects($this->once())
+            ->method('getUrl')
+            ->with('*/*/index', ['_secure' => true])
+            ->willReturn($testUrl);
+
+        $this->redirectMock->expects($this->once())
+            ->method('error')
+            ->with($testUrl)
+            ->willReturn($testUrl);
+
+        $this->redirectResultMock->expects($this->once())
+            ->method('setUrl')
+            ->with($testUrl)
+            ->willReturnSelf();
+
+        $this->model->getDefaultRedirect();
+    }
+
     /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Bad request.
      * @dataProvider getParametersDataProvider
      */
     public function testNoCustomerIdInRequest($customerId, $key)
@@ -210,27 +233,6 @@ public function testNoCustomerIdInRequest($customerId, $key)
             ->with($this->equalTo('key'), false)
             ->will($this->returnValue($key));
 
-        $exception = new \Exception('Bad request.');
-        $this->messageManagerMock->expects($this->once())
-            ->method('addException')
-            ->with($this->equalTo($exception), $this->equalTo('There was an error confirming the account'));
-
-        $testUrl = 'http://example.com';
-        $this->urlMock->expects($this->once())
-            ->method('getUrl')
-            ->with($this->equalTo('*/*/index'), ['_secure' => true])
-            ->will($this->returnValue($testUrl));
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($this->equalTo($testUrl))
-            ->will($this->returnValue($testUrl));
-
-        $this->redirectResultMock->expects($this->once())
-            ->method('setUrl')
-            ->with($this->equalTo($testUrl))
-            ->willReturnSelf();
-
         $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->execute());
     }
 
@@ -315,9 +317,9 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
     public function getSuccessMessageDataProvider()
     {
         return [
-            [1, 1, false, null, __('Thank you for registering with')],
-            [1, 1, true, Address::TYPE_BILLING, __('enter you billing address for proper VAT calculation')],
-            [1, 1, true, Address::TYPE_SHIPPING, __('enter you shipping address for proper VAT calculation')],
+            [1, 1, false, null, 'Thank you for registering with'],
+            [1, 1, true, Address::TYPE_BILLING, 'enter you billing address for proper VAT calculation'],
+            [1, 1, true, Address::TYPE_SHIPPING, 'enter you shipping address for proper VAT calculation'],
         ];
     }
 
@@ -390,18 +392,17 @@ public function testSuccessRedirect(
             ->with($this->equalTo('*/*/index'), ['_secure' => true])
             ->will($this->returnValue($successUrl));
 
-        $this->redirectMock->expects($this->never())
+        $this->redirectMock->expects($this->once())
             ->method('success')
             ->with($this->equalTo($resultUrl))
-            ->will($this->returnValue($resultUrl));
+            ->willReturn($resultUrl);
 
-        $this->scopeConfigMock->expects($this->never())
+        $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                $this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),
-                $this->equalTo(ScopeInterface::SCOPE_STORE)
+            ->with(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
+                ScopeInterface::SCOPE_STORE
             )
-            ->will($this->returnValue($isSetFlag));
+            ->willReturn($isSetFlag);
 
         $this->model->execute();
     }
@@ -419,7 +420,7 @@ public function getSuccessRedirectDataProvider()
                 null,
                 'http://example.com/back',
                 true,
-                __('Thank you for registering with'),
+                'Thank you for registering with',
             ],
             [
                 1,
@@ -428,7 +429,7 @@ public function getSuccessRedirectDataProvider()
                 'http://example.com/success',
                 'http://example.com/success',
                 true,
-                __('Thank you for registering with'),
+                'Thank you for registering with',
             ],
             [
                 1,
@@ -437,7 +438,7 @@ public function getSuccessRedirectDataProvider()
                 'http://example.com/success',
                 'http://example.com/success',
                 false,
-                __('Thank you for registering with'),
+                'Thank you for registering with',
             ],
         ];
     }