MAGETWO-43285: If you change page layout on grid, then the node of this page will be removed from hierarchy and Custom Theme will be changed to "Magento Luma"

Author: Dmytro Poperechnyy

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php

@@ -100,8 +100,11 @@ public function prepareMocksForTestExecute()
             ->willReturn(true);
         $this->request->expects($this->at(0))
             ->method('getParam')
-            ->with('items', [])
-            ->willReturn($postData);
+            ->willReturnMap(
+                [
+                    ['items', [], $postData]
+                ]
+            );
         $this->pageRepository->expects($this->once())
             ->method('getById')
             ->with(1)
@@ -164,7 +167,7 @@ public function testExecuteWithLocalizedException()
             ])
             ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testExecuteWithRuntimeException()
@@ -185,7 +188,7 @@ public function testExecuteWithRuntimeException()
             ])
             ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testExecuteWithException()
@@ -206,7 +209,7 @@ public function testExecuteWithException()
             ])
             ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testExecuteWithoutData()
@@ -220,8 +223,11 @@ public function testExecuteWithoutData()
             ->willReturn([]);
         $this->request->expects($this->at(1))
             ->method('getParam')
-            ->with('isAjax', null)
-            ->willReturn(true);
+            ->willReturnMap(
+                [
+                    ['isAjax', null, true]
+                ]
+            );
         $this->resultJson->expects($this->once())
             ->method('setData')
             ->with([
@@ -232,7 +238,7 @@ public function testExecuteWithoutData()
             ])
             ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testSetCmsPageData()