gridium 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7d9d1bcac31e36fda6bef78eaaaf9f833886cd
-  data.tar.gz: 9045c4caafa09133659f4ec8825dcc264436928e
+  metadata.gz: 0243e90dc04686fa9dd3200eee663b9238dc88bc
+  data.tar.gz: 5bd35b0d358ced862c13feabef4772a73924460a
 SHA512:
-  metadata.gz: d85c4eafeca504f387795108e992e4f8d44c9605f3f03729c48c9c3dc49c54fd1a5641ac38d322d2b8f4f0195e69bb8dd05b234b62c8216fb52494fcd6927385
-  data.tar.gz: f4fd979c9da4b62c497c8a001451bf1a6dc9c8ba8ab205f4bfd615ad74432fd74ccd4f97fbc56ef5bdf223aea38554e2a3287712a412a9e20b93324f61656aed
+  metadata.gz: 72aa492030136743d2807f645abe6a751448f1cad8bdcab669742f0a8314644de396df415482047c8a86124381c376479eb889ec6233f2319f274980d5b00fff
+  data.tar.gz: be03d5a63d31c63608613caab100a584a4dd6b5db152988e49f685b1c682a5a37f6b42b3be518d583acaec756e0e62ffda377aa486f336010f58191a9aae2361

data/lib/gridium/version.rb

@@ -1,3 +1,3 @@
 module Gridium
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/lib/page.rb

@@ -103,19 +103,36 @@ module Gridium
       Driver.driver.find_elements(by, locator).first
     end
 
-    def click_link(link_text)
-      Element.new("Clicking #{link_text} Link", :link_text, link_text).click
+    def click_on(text)
+      Element.new("Clicking #{text}", :xpath, "//*[text()='#{text}')]").click
     end
 
-    def click_button(button_name)
+    # Click the link on the page
+    # @param [String] link_text - Text of the link to click
+    # @param [Integer] link_index (optional) - With multiple links on the page with the same name, click on the specified link index
+    def click_link(link_text, link_index: nil)
+      if link_index
+        Element.new("Clicking #{link_text} Link (#{link_index})", :xpath, "(//a[contains(., '#{link_text}')])[#{link_index}]").click
+      else
+        Element.new("Clicking #{link_text} Link", :xpath, "//a[contains(., '#{link_text}')]").click
+      end
+    end
+
+    # Click the button on the page
+    # @param [String] link_text - Text of the link to click
+    # @param [Integer] link_index - With multiple links on the page with the same name, click on the specified link index (Defaults to first link found)
+    def click_button(button_name, button_index: nil)
       #The button maybe a link that looks like a button - we want to handle both
-      button = Element.new("A #{button_name} button", :xpath, "//button[contains(., '#{button_name}')]")
+      if button_index
+        button = Element.new("Clicking #{button_name} button (#{button_index})", :xpath, "(//button[contains(., '#{button_name}')])[#{button_index}]")
+      else
+        button = Element.new("Clicking #{button_name} button", :xpath, "//button[contains(., '#{button_name}')]")
+      end
       begin
         button.click
       rescue Exception
         Log.debug("Button not found - Attempting Link - speed up test by using click_link method if this works...")
-        link = Element.new("A #{button_name} link", :xpath, "//a[contains(., '#{button_name}')]")
-        link.click
+        click_link button_name, link_index: button_index
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Seth Urban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler