Added a selector to find buttons by their label, e.g. find(By.buttonT…

…ext('Add to cart'));

core/src/main/java/net/thucydides/core/annotations/findby/By.java

@@ -60,6 +60,46 @@ public static By jquery(final String jQuerySelector) {
         return new ByjQuerySelector(jQuerySelector);
     }
 
+    public static By buttonText(final String text) {
+        Preconditions.checkNotNull(text);
+        return new ByButtonTextSelector(text);
+    }
+
+    public static class ByButtonTextSelector extends By {
+
+        String buttonLabel;
+
+        public ByButtonTextSelector(String buttonLabel) {
+            this.buttonLabel = buttonLabel;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public List<WebElement> findElements(SearchContext context) {
+            return context.findElements(byXpathforButtonWithLabel(buttonLabel));
+        }
+
+        @Override
+        public WebElement findElement(SearchContext context) {
+
+            WebElement element = context.findElement(byXpathforButtonWithLabel(buttonLabel));
+            if (element != null){
+                return element;
+            }
+            throw new NoSuchElementException("Cannot locate element using " + toString());
+        }
+
+        private org.openqa.selenium.By byXpathforButtonWithLabel(String buttonLabel) {
+            return By.xpath(String.format("//*[normalize-space(.)=\"%s\"]", buttonLabel));
+        }
+
+        @Override
+        public String toString() {
+            return "By.buttonText: " + buttonLabel;
+        }
+    }
+
+
     public static class ByjQuerySelector extends By {
         private final String jQuerySelector;
 

core/src/test/groovy/net/thucydides/core/annotations/findby/integration/WhenUsingSmartFindBy.groovy

@@ -29,6 +29,44 @@ class WhenUsingSmartFindBy extends Specification {
             element.getAttribute("value")  == "<enter first name>"
 	}
 
+
+    def "should be able to find an element using button text"(){
+
+        when: "we try to find an element using button text"
+        def element = driver.findElement(By.buttonText("Red Button"))
+
+        then: "we should find the element"
+        element.getAttribute("id")  == "red-button"
+    }
+
+    def "should throw exception if button not found"(){
+
+        when: "we try to find an element using button text"
+        def element = driver.findElement(By.buttonText("Missing Button"))
+
+        then:
+            thrown(NoSuchElementException)
+    }
+
+    def "should be able to find elements using button text"(){
+
+        when: "we try to find an element using button text"
+        def elements = driver.findElements(By.buttonText("Blue's Button"))
+
+        then: "we should find the element"
+        elements.size() == 1
+    }
+
+
+    def "should return an empty list if no matching buttons found"(){
+
+        when: "we try to find elements using button text"
+        def elements = driver.findElements(By.buttonText("Mission Button"))
+
+        then: "we should not find the element"
+        elements.size() == 0
+    }
+
     def "should be able to find a nested element using jquery"(){
 
         when: "we try to find an element using a jquery selector"

core/src/test/resources/static-site/index.html

@@ -110,6 +110,9 @@ <h3 id="placetitle">Location</h3>
     <input id="buttonThatIsInitiallyEnabled" type="submit" value="Initially enabled"/>
     <input id="alertButton" type="button" value="Alert" onclick="alert('Alert!');"/>
 
+    <button id="red-button">Red Button</button>
+    <button id="blue-button">Blue's Button</button>
+
     <input name="hiddenfield" type="hidden"/>
 
     <input name="csshiddenfield" style="display: none"/>