Merge branch 'gimler-patch-1'

i18n/en.xliff.dist

@@ -19,6 +19,10 @@
                 <source>(I )follow the :index :link link</source>
                 <target></target>
             </trans-unit>
+            <trans-unit id="i-press-the-nth-button">
+                <source>(I )press the :index :button button</source>
+                <target></target>
+            </trans-unit>
             <trans-unit id="i-fill-in-with-the-current-date">
                 <source>(I )fill in :field with the current date</source>
                 <target></target>

src/Context/BaseContext.php

@@ -131,6 +131,20 @@ protected function countElements($element, $index, $parent)
         }
 
         $elements = $parents[$index - 1]->findAll('css', $element);
+
         return count($elements);
     }
+
+    protected function findElement($selector, $locator, $index)
+    {
+        $page = $this->getSession()->getPage();
+
+        $nodes = $page->findAll($selector, $locator);
+
+        if (!isset($nodes[$index - 1])) {
+            throw new \Exception("The $index $selector '$locator' was not found anywhere in the page");
+        }
+
+        return $nodes[$index - 1];
+    }
 }

src/Context/BrowserContext.php

@@ -58,14 +58,8 @@ public function iAmOnUrlComposedBy(TableNode $tableNode)
      */
     public function iClickOnTheNthElement($index, $element)
     {
-        $nodes = $this->getSession()->getPage()->findAll('css', $element);
-
-        if (isset($nodes[$index - 1])) {
-            $nodes[$index - 1]->click();
-        }
-        else {
-            throw new \Exception("The element '$element' number $index was not found anywhere in the page");
-        }
+        $node = $this->findElement('css', $element, $index);
+        $node->click();
     }
 
     /**
@@ -75,17 +69,21 @@ public function iClickOnTheNthElement($index, $element)
      */
     public function iFollowTheNthLink($index, $link)
     {
-        $page = $this->getSession()->getPage();
-
-        $links = $page->findAll('named', [
-            'link', $this->getSession()->getSelectorsHandler()->xpathLiteral($link)
-        ]);
-
-        if (!isset($links[$index - 1])) {
-            throw new \Exception("The $index element '$link' was not found anywhere in the page");
-        }
+        $element = ['link', $this->getSession()->getSelectorsHandler()->xpathLiteral($link)];
+        $node = $this->findElement('named', $element, $index);
+        $node->click();
+    }
 
-        $links[$index - 1]->click();
+    /**
+     * Presses the nth specified button
+     *
+     * @When (I )press the :index :button button
+     */
+    public function pressTheNthButton($index, $button)
+    {
+        $element = ['button', $this->getSession()->getSelectorsHandler()->xpathLiteral($button)];
+        $node = $this->findElement('named', $element, $index);
+        $node->click();
     }
 
     /**

tests/features/browser.feature

@@ -42,7 +42,11 @@ Feature: Browser Feature
         And the "months_selector" select box should not contain "december"
         And the "months_selector" select box should contain "january"
         When I click on the 1st "ul li" element
-        Then I should see "You clicked First"
+        Then I should see "You clicked First LI"
+        When I press the 2nd "Submit" button
+        Then I should see "You clicked Second BUTTON"
+        When I follow the 1st "Second" link
+        Then I should see "You clicked Second A"
 
     @javascript
     Scenario: Frames testing

tests/fixtures/www/browser/elements.html

@@ -16,13 +16,18 @@
         </ul>
         <span id="element"></span>
     </div>
+    <a href="#">First</a>
+    <a href="#">Second</a>
     <form>
         <input type="text" name="today" />
+
+        <button type="button" title="Submit">First</button>
+        <button type="button" title="Submit">Second</button>
     </form>
     <script>
-        [].forEach.call(document.querySelectorAll('li'), function(el) {
+        [].forEach.call(document.querySelectorAll('li, a, button'), function(el) {
                 el.addEventListener('click', function() {
-                    document.getElementById('element').innerHTML = 'You clicked ' + el.innerHTML;
+                    document.getElementById('element').innerHTML = 'You clicked ' + el.innerHTML + ' ' + el.tagName;
                 })
             });
     </script>