Merge pull request #656 from magento-troll/Bugfixes_S45

[Troll] Bugfixes S45

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();
+    }
 }

app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php

@@ -93,31 +93,9 @@ public function setUp()
 
     public function testExecute()
     {
-        $layout = $this->getMock(
-            '\Magento\Framework\View\Layout',
-            ['getBlock', 'initMessages'],
-            [],
-            '',
-            false
-        );
-        $block = $this->getMockForAbstractClass(
-            '\Magento\Framework\View\Element\AbstractBlock',
-            ['setFormAction'],
-            '',
-            false
-        );
-        $layout->expects($this->once())
-            ->method('getBlock')
-            ->with('contactForm')
-            ->will($this->returnValue($block));
-
         $this->_view->expects($this->once())
             ->method('loadLayout');
 
-        $this->_view->expects($this->exactly(1))
-            ->method('getLayout')
-            ->will($this->returnValue($layout));
-
         $this->_view->expects($this->once())
             ->method('renderLayout');
 

app/code/Magento/Contact/composer.json

@@ -5,6 +5,7 @@
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/module-config": "1.0.0-beta",
         "magento/module-store": "1.0.0-beta",
+        "magento/module-backend": "1.0.0-beta",
         "magento/module-customer": "1.0.0-beta",
         "magento/module-cms": "1.0.0-beta",
         "magento/framework": "1.0.0-beta",

app/code/Magento/Swatches/view/frontend/web/js/SwatchRenderer.js

@@ -173,15 +173,15 @@ define(["jquery", "jquery/ui"], function ($) {
                 moreButton: 'swatch-more',
                 loader: 'swatch-option-loading'
             },
-            jsonConfig: {},                                 // option's json config
-            jsonSwatchConfig: {},                           // swatch's json config
-            selectorProduct: '.product-info-main',          // selector of parental block of prices and swatches (need to know where to seek for price block)
-            selectorProductPrice: '.price',                 // selector of price wrapper (need to know where set price)
-            numberToShow: false,                            // number of controls to show (false or zero = show all)
-            onlySwatches: false,                            // show only swatch controls
-            enableControlLabel: true,                       // enable label for control
-            moreButtonText: 'More',                         // text for more button
-            mediaCallback: ''                               // Callback url for media
+            jsonConfig: {},                                    // option's json config
+            jsonSwatchConfig: {},                              // swatch's json config
+            selectorProduct: '.product-info-main',             // selector of parental block of prices and swatches (need to know where to seek for price block)
+            selectorProductPrice: '.price-final-price .price', // selector of price wrapper (need to know where set price)
+            numberToShow: false,                               // number of controls to show (false or zero = show all)
+            onlySwatches: false,                               // show only swatch controls
+            enableControlLabel: true,                          // enable label for control
+            moreButtonText: 'More',                            // text for more button
+            mediaCallback: ''                                  // Callback url for media
         },
 
         /**