Merge branch 'MAGETWO-35324' of github.corp.ebay.com:magento-troll/magento2ce into develop

Author: slopukhov

app/code/Magento/Contact/Block/ContactForm.php

@@ -21,4 +21,14 @@ public function __construct(Template\Context $context, array $data = [])
         parent::__construct($context, $data);
         $this->_isScopePrivate = true;
     }
+
+    /**
+     * Returns action url for contact form
+     *
+     * @return string
+     */
+    public function getFormAction()
+    {
+        return $this->getUrl('contact/index/post', ['_secure' => true]);
+    }
 }

app/code/Magento/Contact/Controller/Index/Index.php

@@ -16,9 +16,6 @@ class Index extends \Magento\Contact\Controller\Index
     public function execute()
     {
         $this->_view->loadLayout();
-        $this->_view->getLayout()
-            ->getBlock('contactForm')
-            ->setFormAction($this->_url->getUrl('*/*/post', ['_secure' => true]));
         $this->_view->renderLayout();
     }
 }

app/code/Magento/Contact/Controller/Index/Post.php

@@ -65,14 +65,14 @@ public function execute()
             $this->messageManager->addSuccess(
                 __('Thanks for contacting us with your comments and questions. We\'ll respond to you very soon.')
             );
-            $this->_redirect('*/*/');
+            $this->_redirect('contact/index');
             return;
         } catch (\Exception $e) {
             $this->inlineTranslation->resume();
             $this->messageManager->addError(
                 __('We can\'t process your request right now. Sorry, that\'s all we know.')
             );
-            $this->_redirect('*/*/');
+            $this->_redirect('contact/index');
             return;
         }
     }

app/code/Magento/Contact/Test/Unit/Block/ContactFormTest.php

@@ -20,15 +20,29 @@ class ContactFormTest extends \PHPUnit_Framework_TestCase
      */
     protected $contextMock;
 
+    /**
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilderMock;
+
     /**
      * {@inheritDoc}
      */
     protected function setUp()
     {
         $this->contextMock = $this->getMockBuilder('Magento\Framework\View\Element\Template\Context')
             ->disableOriginalConstructor()
+            ->setMethods(['getUrlBuilder'])
             ->getMock();
 
+        $this->urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->any())
+            ->method('getUrlBuilder')
+            ->willReturn($this->urlBuilderMock);
+
         $this->contactForm = new ContactForm(
             $this->contextMock
         );
@@ -41,4 +55,15 @@ public function testScope()
     {
         $this->assertTrue($this->contactForm->isScopePrivate());
     }
+
+    /**
+     * @return void
+     */
+    public function testGetFormAction()
+    {
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('contact/index/post', ['_secure' => true]);
+        $this->contactForm->getFormAction();
+    }
 }