Fixed action sequence to include multiple actions of same name. Fixes #…

…4044
Codeception · Mar 20, 2017 · 2bfcd4e · 2bfcd4e
1 parent b3856b9
commit 2bfcd4e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -2942,7 +2942,9 @@ public function performOn($element, $actions, $timeout = 10)
         if (!is_array($actions)) {
             throw new \InvalidArgumentException("2nd parameter, actions should be a valid callable or array");
         }
-        foreach ($actions as $action => $value) {
+        foreach ($actions as $actionDefinition => $value) {
+            $actionDefinition = explode('.', $actionDefinition);
+            $action = end($actionDefinition);
             if (!is_array($value)) {
                 $value = [$value];
             }

diff --git a/src/Codeception/Util/ActionSequence.php b/src/Codeception/Util/ActionSequence.php
@@ -43,6 +43,8 @@ class ActionSequence
 {
     protected $actions = [];
 
+    private $counter = 1;
+
     /**
      * Creates an instance
      * @return ActionSequence
@@ -54,7 +56,9 @@ public static function build()
 
     public function __call($action, $arguments)
     {
-        $this->actions[$action] = $arguments;
+        $key = "{$this->counter}.$action";
+        $this->actions[$key] = $arguments;
+        $this->counter++;
         return $this;
     }
 

diff --git a/tests/web/WebDriverTest.php b/tests/web/WebDriverTest.php
@@ -946,7 +946,6 @@ public function testPerformOnWithCallback()
         $this->module->see('Login');
     }
 
-
     public function testPerformOnWithBuiltArray()
     {
         $asserts = \PHPUnit\Framework\Assert::getCount();
@@ -960,6 +959,19 @@ public function testPerformOnWithBuiltArray()
         $this->module->see('Login');
     }
 
+    public function testPerformOnWithArrayAndSimilarActions()
+    {
+        $asserts = \PHPUnit\Framework\Assert::getCount();
+        $this->module->amOnPage('/form/example1');
+        $this->module->performOn('.rememberMe', \Codeception\Util\ActionSequence::build()
+            ->see('Remember me')
+            ->see('next time')
+            ->dontSee('Login')
+        );
+        $this->assertEquals(3, \PHPUnit\Framework\Assert::getCount() - $asserts);
+        $this->module->see('Login');
+    }
+
     public function testPerformOnFail()
     {
         $this->shouldFail();