Respect base element with fillField() (#80)

mbrodala · web-flow · commit df1a28c7daff · 2021-12-08T12:08:09.000-05:00
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -1255,7 +1255,7 @@ protected function findFields($selector): array
         }
 
         if (is_array($selector) || ($selector instanceof WebDriverBy)) {
-            $fields = $this->match($this->webDriver, $selector);
+            $fields = $this->match($this->getBaseElement(), $selector);
 
             if (empty($fields)) {
                 throw new ElementNotFound($selector);
@@ -1272,20 +1272,20 @@ protected function findFields($selector): array
             ".//label[contains(normalize-space(string(.)), {$locator})]//.//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]"
         // @codingStandardsIgnoreEnd
         );
-        $fields = $this->webDriver->findElements(WebDriverBy::xpath($xpath));
+        $fields = $this->getBaseElement()->findElements(WebDriverBy::xpath($xpath));
         if (!empty($fields)) {
             return $fields;
         }
 
         // by name
         $xpath = ".//*[self::input | self::textarea | self::select][@name = {$locator}]";
-        $fields = $this->webDriver->findElements(WebDriverBy::xpath($xpath));
+        $fields = $this->getBaseElement()->findElements(WebDriverBy::xpath($xpath));
         if (!empty($fields)) {
             return $fields;
         }
 
         // try to match by CSS or XPath
-        $fields = $this->match($this->webDriver, $selector, false);
+        $fields = $this->match($this->getBaseElement(), $selector, false);
         if (!empty($fields)) {
             return $fields;
         }
diff --git a/tests/data/app/view/form/bug79.php b/tests/data/app/view/form/bug79.php
@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+    <head><title></title></head>
+    <body>
+        <form>
+            <label for="title-1">Title</label>
+            <input id="title-1">
+
+            <div class="nested">
+                <label for="title-2">Title</label>
+                <input id="title-2">
+            </div>
+        </form>
+    </body>
+</html>
diff --git a/tests/unit/Codeception/Module/TestsForWeb.php b/tests/unit/Codeception/Module/TestsForWeb.php
@@ -4,6 +4,7 @@
 
 use Codeception\Module\WebDriver;
 use Codeception\Test\Unit;
+use Codeception\Util\ActionSequence;
 
 /**
  * Author: davert
@@ -1745,4 +1746,24 @@ public function testPasswordArgument()
         $data = data::get('form');
         $this->assertEquals('thisissecret', $data['password']);
     }
+
+    /**
+     * @see https://github.com/Codeception/module-webdriver/issues/79
+     */
+    public function testFieldActionsWithPerformOn()
+    {
+        $this->module->amOnPage('/form/bug79');
+        $this->module->performOn(
+            ['class' => 'nested'],
+            ActionSequence::build()->fillField('Title', 'Test')
+        );
+
+        $this->module->dontSeeInField('#title-1', 'Test');
+        $this->module->seeInField('#title-2', 'Test');
+
+        $title1Value = $this->module->grabValueFrom('#title-1');
+        $this->assertEmpty($title1Value);
+        $title2Value = $this->module->grabValueFrom('#title-2');
+        $this->assertEquals('Test', $title2Value);
+    }
 }
