Merge remote-tracking branch 'origin/MAGETWO-86935' into 2.1-develop-pr54

Author: DianaRusin

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

@@ -32,7 +32,10 @@ public function execute()
         $aclResource = $component->getData('acl');
 
         if ($aclResource && !$this->_authorization->isAllowed($aclResource)) {
-            $this->_redirect('admin/noroute');
+            if (!$this->_request->isAjax()) {
+                $this->_redirect('admin/noroute');
+            }
+
             return;
         }
 

app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php

@@ -149,6 +149,15 @@ public function testExecuteAjaxRequestWithoutPermissions($acl, $isAllowed)
             ->method('getParam')
             ->with('namespace')
             ->willReturn($name);
+
+        if ($isAllowed === false) {
+            $this->requestMock->expects($this->once())
+                ->method('isAjax')
+                ->willReturn(true);
+        }
+
+        $this->responseMock->expects($this->never())
+            ->method('setRedirect');
         $this->responseMock->expects($this->any())
             ->method('appendBody')
             ->with($renderedData);