minkphp
diff --git a/‎tests/Exception/ExpectationExceptionTest.php‎
Lines changed: 34 additions & 0 deletions b/‎tests/Exception/ExpectationExceptionTest.php‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎tests/Selector/Xpath/ManipulatorTest.php‎
Lines changed: 16 additions & 0 deletions b/‎tests/Selector/Xpath/ManipulatorTest.php‎
Lines changed: 16 additions & 0 deletions
@@ -2,7 +2,9 @@
 
 namespaceBehat\Mink\Tests\Exception;
 
+useBehat\Mink\Driver\DriverInterface;
 useBehat\Mink\Exception\ExpectationException;
+useBehat\Mink\Exception\UnsupportedDriverActionException;
 usePHPUnit\Framework\TestCase;
 
 class ExpectationExceptionTest extends TestCase
@@ -49,6 +51,38 @@ public function testExceptionToString()
 $this->assertEquals($expected, $exception->__toString());
  }
 
+publicfunctiontestUnsupportedStatusCode()
+ {
+$driver = $this->createStub(DriverInterface::class);
+
+$driver->method('getStatusCode')
+ ->willThrowException(newUnsupportedDriverActionException('Status code is not supported.', $driver));
+$driver->method('getCurrentUrl')
+ ->willReturn('http://localhost/test');
+
+$html = "<html><head><title>Hello</title></head>\n<body>\n<h1>Hello world</h1>\n<p>Test</p>\n</body></html>";
+$driver->method('getContent')
+ ->willReturn($html);
+
+$expected = <<<'TXT'
+Expectation failure
+
++--[ http://localhost/test | %s ]
+|
+| <body>
+| <h1>Hello world</h1>
+| <p>Test</p>
+| </body>
+|
+TXT;
+
+$expected = sprintf($expected.'', get_class($driver));
+
+$exception = newExpectationException('Expectation failure', $driver);
+
+$this->assertEquals($expected, $exception->__toString());
+ }
+
 publicfunctiontestBigContent()
  {
 $driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
 
@@ -65,6 +65,22 @@ public function getPrependedXpath()
 "some_tag[(contains(normalize-space(string(.)), 'foo|bar') | other_tag[contains(./@some_attribute, 'foo|bar')])]",
 "some_xpath/some_tag[(contains(normalize-space(string(.)), 'foo|bar') | other_tag[contains(./@some_attribute, 'foo|bar')])]",
  ),
+// Invalid XPath queries should be handled gracefully to let the DOMQuery report a proper failure for them later
+'unclosed string literal single quote' => array(
+'some_xpath',
+"some_tag1 | some_tag2[@foo = 'bar]",
+"some_xpath/some_tag1 | some_tag2[@foo = 'bar]",
+ ),
+'unclosed string literal double quote' => array(
+'some_xpath',
+'some_tag1 | some_tag2[@foo = "bar]',
+'some_xpath/some_tag1 | some_tag2[@foo = "bar]',
+ ),
+'unclosed bracket' => array(
+'some_xpath',
+'some_tag1 | some_tag2[@foo = "bar"',
+'some_xpath/some_tag1 | some_tag2[@foo = "bar"',
+ ),
  );
  }
 }