MAGETWO-37464: Merge and Fix Builds

 - fix build failures

Author: Cari Spruiell

app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php

@@ -44,6 +44,9 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param ResponseInterface $response
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Backend\App\BackendAppList $backendAppList
      * @param \Magento\Framework\HTTP\Authentication $httpAuthentication
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\AuthorizationInterface $authorization
@@ -55,6 +58,9 @@ public function __construct(
         ResponseInterface $response,
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Magento\Backend\Model\UrlInterface $backendUrl,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Backend\App\BackendAppList $backendAppList,
         \Magento\Framework\HTTP\Authentication $httpAuthentication,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\AuthorizationInterface $authorization,
@@ -64,7 +70,8 @@ public function __construct(
         $this->logger = $logger;
         $this->authorization = $authorization;
         $this->aclResources = $aclResources;
-        parent::__construct($auth, $url, $response, $actionFlag, $messageManager);
+        parent::__construct($auth, $url, $response, $actionFlag, $messageManager, $backendUrl, $resultRedirectFactory,
+            $backendAppList);
     }
 
     /**

setup/src/Magento/Setup/Test/Unit/Controller/IndexTest.php

@@ -10,10 +10,37 @@
 
 class IndexTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\ObjectManagerProvider
+     */
+    private $objectManagerProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
     public function testIndexAction()
     {
+        $this->objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
+        $this->objectManagerProvider = $this->getMock(
+            'Magento\Setup\Model\ObjectManagerProvider',
+            ['get'],
+            [],
+            '',
+            false
+        );
+        $this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
+        $this->objectManagerProvider->expects($this->once())->method('get')->willReturn($this->objectManager);
+        $this->objectManager->expects($this->once())->method('get')->willReturn($this->deploymentConfig);
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         /** @var $controller Index */
-        $controller = new Index();
+        $controller = new Index($this->objectManagerProvider);
         $viewModel = $controller->indexAction();
         $this->assertInstanceOf('Zend\View\Model\ViewModel', $viewModel);
         $this->assertFalse($viewModel->terminate());