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

Author: slopukhov

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",