testcentricity_web 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e42ac93ef15779ceee1ea3c82e998a92e0dbf2d0
-  data.tar.gz: ad99dbd1f03c653cba860d51cf5707fbe8f02532
+  metadata.gz: e7a8bd1506e8dca866cb4eb471864452a4553c14
+  data.tar.gz: 8d82ed2f8313b4469f2fe5ed718e70e7fb3a2389
 SHA512:
-  metadata.gz: 228a1e59a8bf01d884bbf8dcc76e6471adea078244f55ec8cb2cd8a7c2996a700b8e66fdd2e6494f4b3dcde23a391d6bd59641ad849f01840df2c0ff48418b97
-  data.tar.gz: 107ddf980a20d340dc348863e122305e5ab6cbe49f53926f1ad35fc307a6afeb08a1203d1130fd811f6233dd0153e7ed1f4f59910ad2b75841a88eff279f5035
+  metadata.gz: 3a11e9d5127c6e7b7696fe9848d82ea9e567b08e9fe0ecc310bfa9d64106a6217d006983c1eb07e3ef794719218066427313f52d9ac09f67bcde06e4346a78d1
+  data.tar.gz: 513cbce517d55774862934a9e7d16eff505bfa03a78805d335a80935113a14ca05cb4b134f5fdb25f3b1f110b9f3f02d6c40ebd4f40c852384fa02cf682770ba

data/lib/testcentricity_web/elements/select_list.rb

@@ -27,8 +27,6 @@ module TestCentricity
         else
           first(:css, 'li.active-result', text: option).click
         end
-      elsif first(:xpath, "//ul/li")
-        first(:xpath, "//ul/li", text: option).click
       else
         if option.is_a?(Array)
           option.each do |item|

data/lib/testcentricity_web/elements/table.rb

@@ -1,11 +1,46 @@
 module TestCentricity
   class Table < UIElement
+    attr_accessor :table_body
+    attr_accessor :table_row
+    attr_accessor :table_column
+    attr_accessor :table_header
+    attr_accessor :header_row
+    attr_accessor :header_column
+
     def initialize(parent, locator, context)
-      @parent  = parent
-      @locator = locator
-      @context = context
-      @type    = :table
-      @alt_locator = nil
+      @parent        = parent
+      @locator       = locator
+      @context       = context
+      @type          = :table
+      @alt_locator   = nil
+
+      table_spec = { :table_body    => 'tbody',
+                     :table_row     => 'tr',
+                     :table_column  => 'td',
+                     :table_header  => 'thead',
+                     :header_row    => 'tr',
+                     :header_column => 'th'
+      }
+      define_table_elements(table_spec)
+    end
+
+    def define_table_elements(element_spec)
+      element_spec.each do | element, value |
+        case element
+        when :table_body
+          @table_body = value
+        when :table_row
+          @table_row = value
+        when :table_column
+          @table_column = value
+        when :table_header
+          @table_header = value
+        when :header_row
+          @header_row = value
+        when :header_column
+          @header_column = value
+        end
+      end
     end
 
     # Return number of rows in a table object.
@@ -16,7 +51,7 @@ module TestCentricity
     #
     def get_row_count
       wait_until_exists(5)
-      row_count = page.all(:xpath, "#{@locator}/tbody/tr", :visible => :all).count
+      row_count = page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}", :visible => :all).count
       row_count
     end
 
@@ -29,11 +64,11 @@ module TestCentricity
     def get_column_count
       row_count = get_row_count
       if row_count == 0
-        page.all(:xpath, "#{@locator}/thead/tr/th", :visible => :all).count
+        page.all(:xpath, "#{@locator}/#{@table_header}/#{@header_row}/#{@header_column}", :visible => :all).count
       else
         (row_count == 1) ?
-            page.all(:xpath, "#{@locator}/tbody/tr/td", :visible => :all).count :
-            page.all(:xpath, "#{@locator}/tbody/tr[2]/td", :visible => :all).count
+            page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}/#{@table_column}", :visible => :all).count :
+            page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}[2]/#{@table_column}", :visible => :all).count
       end
     end
 
@@ -128,8 +163,8 @@ module TestCentricity
       row_count = get_row_count
       raise "Row #{row} exceeds number of rows (#{row_count}) in table #{@locator}" if row > row_count
       (row > 1) ?
-          set_alt_locator("#{@locator}/tbody/tr[#{row}]") :
-          set_alt_locator("#{@locator}/tbody/tr")
+          set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}[#{row}]") :
+          set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}")
       value = get_value if exists?
       clear_alt_locator
       value
@@ -255,7 +290,7 @@ module TestCentricity
     def click_header_column(column)
       column_count = get_column_count
       raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{@locator}" if column > column_count
-      set_alt_locator("#{@locator}/thead/tr/th[#{column}]")
+      set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
       click if exists?
       clear_alt_locator
     end
@@ -263,7 +298,7 @@ module TestCentricity
     def get_header_column(column)
       column_count = get_column_count
       raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{@locator}" if column > column_count
-      set_alt_locator("#{@locator}/thead/tr/th[#{column}]")
+      set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
       value = get_value(:all) if exists?(:all)
       clear_alt_locator
       value
@@ -273,14 +308,13 @@ module TestCentricity
       columns = []
       column_count = get_column_count
       (1..column_count).each do |column|
-        set_alt_locator("#{@locator}/thead/tr/th[#{column}]")
+        set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
         columns.push(get_value(:all)) if exists?(:all)
       end
       clear_alt_locator
       columns
     end
 
-
     def is_table_row_expanded?(row, column)
       row_count = get_row_count
       raise "Row #{row} exceeds number of rows (#{row_count}) in table #{@locator}" if row > row_count
@@ -324,9 +358,9 @@ module TestCentricity
     private
 
     def set_table_cell_locator(row, column)
-      row_spec = "#{@locator}/tbody/tr"
+      row_spec = "#{@locator}/#{@table_body}/#{@table_row}"
       row_spec = "#{row_spec}[#{row}]" if row > 1
-      column_spec = "/td[#{column}]"
+      column_spec = "/#{@table_column}[#{column}]"
       set_alt_locator("#{row_spec}#{column_spec}")
     end
 

data/lib/testcentricity_web/ui_elements_helper.rb

@@ -197,6 +197,20 @@ module TestCentricity
       raise "Could not find element #{@locator} after #{timeout} seconds" unless exists?
     end
 
+    # Wait until the object is visible, or until the specified wait time has expired.
+    #
+    # @param seconds [Integer or Float] wait time in seconds
+    # @example
+    #   run_button.wait_until_visible(0.5)
+    #
+    def wait_until_visible(seconds = nil)
+      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { visible? }
+    rescue
+      raise "Could not find element #{@locator} after #{timeout} seconds" unless exists?
+    end
+
     # Wait until the object no longer exists, or until the specified wait time has expired.
     #
     # @param seconds [Integer or Float] wait time in seconds

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler