diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableFactoryTest.php b/core/modules/views/tests/Drupal/views/Tests/ViewExecutableFactoryTest.php index 45f2c62..931d484 100644 --- a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableFactoryTest.php +++ b/core/modules/views/tests/Drupal/views/Tests/ViewExecutableFactoryTest.php @@ -74,19 +74,34 @@ public function setUp() { * @covers ::get */ public function testGet() { - $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request') + $request_1 = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request') ->disableOriginalConstructor() ->getMock(); - $this->requestStack->expects($this->once()) + $request_2 = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $this->requestStack->expects($this->at(0)) ->method('getCurrentRequest') - ->will($this->returnValue($request)); + ->will($this->returnValue($request_1)); + $this->requestStack->expects($this->at(1)) + ->method('getCurrentRequest') + ->will($this->returnValue($request_2)); + + $executable = $this->viewExecutableFactory->get($this->view); + + $this->assertInstanceOf('Drupal\views\ViewExecutable', $executable); + $this->assertSame($executable->getRequest(), $request_1); + $this->assertSame($executable->getUser(), $this->user); + // Call get() again to ensure a new executable is created with the other + // request object. $executable = $this->viewExecutableFactory->get($this->view); $this->assertInstanceOf('Drupal\views\ViewExecutable', $executable); - $this->assertSame($executable->getRequest(), $request); + $this->assertSame($executable->getRequest(), $request_2); $this->assertSame($executable->getUser(), $this->user); }