Merge pull request #91 from olexp/preg-match-typeerror

Avoid TypeError in preg_match()

Author: Naktibalda

src/Codeception/Module/WebDriver.php

@@ -1971,7 +1971,10 @@ public function grabTextFrom($cssOrXPathOrRegex)
             return $els[0]->getText();
         }
 
-        if (@preg_match($cssOrXPathOrRegex, $this->webDriver->getPageSource(), $matches)) {
+        if (
+            is_string($cssOrXPathOrRegex)
+            && @preg_match($cssOrXPathOrRegex, $this->webDriver->getPageSource(), $matches)
+        ) {
             return $matches[1];
         }
 

tests/unit/Codeception/Module/TestsForWeb.php

@@ -706,6 +706,19 @@ public function testGrabTextFrom()
         $this->assertSame('test', $result);
     }
 
+    public function testGrabTextFromWithArraySelectorForExistingElement()
+    {
+        $this->module->amOnPage('/');
+        $this->assertSame('More info', $this->module->grabTextFrom(['id' => 'link']));
+    }
+
+    public function testGrabTextFromWithArraySelectorForNonExistentElement()
+    {
+        $this->module->amOnPage('/');
+        $this->expectException('Codeception\Exception\ElementNotFound');
+        $this->module->grabTextFrom(['id' => 'unknown_link']);
+    }
+
     public function testGrabValueFrom()
     {
         $this->module->amOnPage('/form/hidden');