MAGETWO-75635: Merge 2.2.0-develop into develop

Author: slavvka

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

@@ -5,7 +5,9 @@
  */
 namespace Magento\Ui\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Ui\Controller\Adminhtml\AbstractAction;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Model\UiComponentTypeResolver;
 

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

@@ -60,7 +60,7 @@ class RenderTest extends \PHPUnit\Framework\TestCase
     private $helperMock;
 
     /**
-     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $uiComponentContextMock;
 
@@ -106,7 +106,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->uiComponentContextMock = $this->getMockForAbstractClass(
-            \Magento\Framework\View\Element\UiComponent\ContextInterface::class
+            ContextInterface::class
         );
         $this->dataProviderMock = $this->getMockForAbstractClass(
             \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
@@ -174,13 +174,15 @@ public function testExecuteAjaxRequest()
         $this->uiComponentMock->expects($this->once())
             ->method('getChildComponents')
             ->willReturn([]);
-        $this->uiComponentMock->expects($this->once())
+        $this->uiComponentMock->expects($this->any())
             ->method('getContext')
             ->willReturn($this->uiComponentContextMock);
         $this->uiFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->uiComponentMock);
-        $this->uiComponentTypeResolverMock->expects($this->once())->method('resolve')->with($contextMock)
+        $this->uiComponentTypeResolverMock->expects($this->once())
+            ->method('resolve')
+            ->with($this->uiComponentContextMock)
             ->willReturn('application/json');
         $this->responseMock->expects($this->once())->method('setHeader')
             ->with('Content-Type', 'application/json', true);
@@ -225,7 +227,7 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf
         $this->uiComponentMock->expects($this->any())
             ->method('getChildComponents')
             ->willReturn([]);
-        $this->uiComponentMock->expects($this->once())
+        $this->uiComponentMock->expects($this->any())
             ->method('getContext')
             ->willReturn($this->uiComponentContextMock);
         $this->uiFactoryMock->expects($this->once())