testcentricity_web 3.2.16 → 3.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365b55689ded4886c7c52ca8ccb95e8bce18f6c33b6d08fc6872c26b88c2a7e7
-  data.tar.gz: 534bce4c71c825e0ba51548b180982428ca8d315f58d62752907203271907ce1
+  metadata.gz: 967025c22dced2c769d460dbb4d6a20708293277b43887a82158c64f242686e9
+  data.tar.gz: 9db450d8190d44e31012c45fdad5236507bee75638f323e2bd42632758354743
 SHA512:
-  metadata.gz: 5010441fe14bc169b4f8b51ace3fbed1ace9320cf7882d7529e274640ac327032b704b3cea1e9a64eb25e1966f4a5105070f48c2d8fbb94adb4c4752243e8442
-  data.tar.gz: 75d127eeddce7949fe2d09f265e25d811a9a6f5789632f9ecbe8dc7eef04d78bfe14216188742f208920887a9b64fa96ef29427dbc548a9fb11c3c6bbfc8d6dc
+  metadata.gz: bdceb150bda3a9cfa267e3658a5332a76042deada8d57b58b5862f6b73b1c0e9a49721a7f7f57e99cae851626d67531290463acbd26eb2981193a4e1354bb18e
+  data.tar.gz: cc252a2ec353bc83d91dcd97a8d4c30f89b434107bbbde48d91a9937f5befe1ad9264e62409ac744f8372885f7c67d52bf10260a25c0b45927783a2a8bbf351d

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 All notable changes to this project will be documented in this file.
 
+## [3.2.17] - 19-JUNE-2020
+
+### Changed
+* Updated `Table.define_table_elements` method to accept value for `:row_header` element.
+* Updated `Table.get_row_count`, `Table.get_column_count`, and `Table.get_table_cell_locator` methods to support tables
+with row headers in row #1.
+
 ## [3.2.16] - 13-MAY-2020
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testcentricity_web (3.2.16)
+    testcentricity_web (3.2.17)
       appium_lib
       browserstack-local
       capybara (>= 3.1, < 4)
@@ -25,7 +25,7 @@ GEM
       appium_lib_core (~> 3.3)
       nokogiri (~> 1.8, >= 1.8.1)
       tomlrb (~> 1.1)
-    appium_lib_core (3.7.0)
+    appium_lib_core (3.10.0)
       faye-websocket (~> 0.10.0)
       selenium-webdriver (~> 3.14, >= 3.14.1)
     axiom-types (0.1.1)
@@ -33,7 +33,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     browserstack-local (1.3.0)
-    capybara (3.32.1)
+    capybara (3.32.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -51,13 +51,13 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
     eventmachine (1.2.7)
-    faker (2.11.0)
+    faker (2.12.0)
       i18n (>= 1.6, < 2)
     faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.12.2)
-    i18n (1.8.2)
+    ffi (1.13.1)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     mini_mime (1.0.2)
@@ -67,12 +67,12 @@ GEM
     os (1.1.0)
     power_assert (1.2.0)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.1)
     redcarpet (3.5.0)
-    regexp_parser (1.7.0)
+    regexp_parser (1.7.1)
     ruby-ole (1.2.12.2)
     rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
@@ -80,7 +80,7 @@ GEM
       rubyzip (>= 1.2.2)
     spreadsheet (1.1.7)
       ruby-ole (>= 1.0)
-    test-unit (3.3.5)
+    test-unit (3.3.6)
       power_assert
     thread_safe (0.3.6)
     tomlrb (1.3.0)
@@ -89,13 +89,13 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webdrivers (4.3.0)
+    webdrivers (4.4.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 

data/README.md

@@ -778,7 +778,7 @@ a `/downloads` folder at the same level as the `/config` and `/features` folders
 
 When running tests in multiple concurrent threads using the `parallel_tests` gem, a new folder will be created within the `/downloads` folder for each
 test thread. This is to ensure that files downloaded in each test thread are isolated from tests running in other parallel threads. An example of the
-`/downloads` folder structure for 4 paralle threads is depicted below:
+`/downloads` folder structure for 4 parallel threads is depicted below:
 
     my_automation_project
         ├── config

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '3.2.16'
+  VERSION = '3.2.17'
 end

data/lib/testcentricity_web/web_elements/table.rb

@@ -7,6 +7,7 @@ module TestCentricity
     attr_accessor :table_header
     attr_accessor :header_row
     attr_accessor :header_column
+    attr_accessor :row_header
     attr_accessor :tree_expand
     attr_accessor :tree_collapse
 
@@ -21,7 +22,8 @@ module TestCentricity
         table_column:  'td',
         table_header:  'thead',
         header_row:    'tr',
-        header_column: 'th'
+        header_column: 'th',
+        row_header:    nil
       }
 
       case @locator_type
@@ -52,6 +54,8 @@ module TestCentricity
           @header_row = value
         when :header_column
           @header_column = value
+        when :row_header
+          @row_header = value
         when :tree_expand
           @tree_expand = value
         when :tree_collapse
@@ -70,20 +74,18 @@ module TestCentricity
     #
     def get_row_count
       wait_until_exists(5)
-      case @locator_type
-      when :xpath
-        if @table_section.nil?
-          page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}", visible: :all).count
-        else
-          page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_section}", visible: :all).count
-        end
-      when :css
-        if @table_section.nil?
-          page.all(:css, "#{@locator} > #{@table_body} > #{@table_row}", visible: :all).count
-        else
-          page.all(:css, "#{@locator} > #{@table_body} > #{@table_section}", visible: :all).count
-        end
-      end
+      delimiter = case @locator_type
+                  when :xpath
+                    "/"
+                  when :css
+                    " > "
+                  end
+      path = if @table_section.nil?
+               "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_row}"
+             else
+               "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}"
+             end
+      page.all(@locator_type, path, visible: :all).count
     end
 
     # Wait until the table's row count equals the specified value, or until the specified wait time has expired. If the wait
@@ -138,33 +140,48 @@ module TestCentricity
       row_count = get_row_count
       case @locator_type
       when :xpath
-        if row_count.zero?
-          page.all(:xpath, "#{@locator}/#{@table_header}/#{@header_row}/#{@header_column}", visible: :all).count
-        else
-          if @table_section.nil?
-            row_count == 1 ?
-                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
-          else
-            row_count == 1 ?
-                page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_section}/#{@table_row}/#{@table_column}", visible: :all).count :
-                page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_section}[2]/#{@table_row}/#{@table_column}", visible: :all).count
-          end
-        end
+        delimiter = "/"
+        index = "[2]"
       when :css
-        if row_count.zero?
-          page.all(:css, "#{@locator} > #{@table_header} > #{@header_row} > #{@header_column}", visible: :all).count
-        else
-          if @table_section.nil?
-            row_count == 1 ?
-                page.all(:css, "#{@locator} > #{@table_body} > #{@table_row} > #{@table_column}", visible: :all).count :
-                page.all(:css, "#{@locator} > #{@table_body} > #{@table_row}:nth-of-type(2) > #{@table_column}", visible: :all).count
-          else
-            row_count == 1 ?
-                page.all(:css, "#{@locator} > #{@table_body} > #{@table_section} > #{@table_row} > #{@table_column}", visible: :all).count :
-                page.all(:css, "#{@locator} > #{@table_body} > #{@table_section}:nth-of-type(2) > #{@table_row} > #{@table_column}", visible: :all).count
-          end
-        end
+        delimiter = " > "
+        index = ":nth-of-type(2)"
+      end
+      path = if row_count.zero?
+               "#{@locator}#{delimiter}#{@table_header}#{delimiter}#{@header_row}#{delimiter}#{@header_column}"
+             else
+               if @table_section.nil?
+                 if row_count == 1
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_row}#{delimiter}#{@table_column}"
+                 else
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_row}#{index}#{delimiter}#{@table_column}"
+                 end
+               else
+                 if row_count == 1
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{delimiter}#{@table_row}#{delimiter}#{@table_column}"
+                 else
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{index}#{delimiter}#{@table_row}#{delimiter}#{@table_column}"
+                 end
+               end
+             end
+      if @row_header.nil?
+        page.all(@locator_type, path, visible: :all).count
+      else
+        cols = page.all(@locator_type, path, visible: :all).count
+
+        path = if @table_section.nil?
+                 if row_count == 1
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_row}#{delimiter}#{@row_header}"
+                 else
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_row}#{index}#{delimiter}#{@row_header}"
+                 end
+               else
+                 if row_count == 1
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{delimiter}#{@table_row}#{delimiter}#{@row_header}"
+                 else
+                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{index}#{delimiter}#{@table_row}#{delimiter}#{@row_header}"
+                 end
+               end
+        cols + page.all(@locator_type, path, visible: :all).count
       end
     end
 
@@ -615,7 +632,15 @@ module TestCentricity
           row_spec = "#{@locator}/#{@table_body}/#{@table_section}"
           row_spec = "#{row_spec}[#{row}]/#{@table_row}[1]"
         end
-        column_spec = "/#{@table_column}[#{column}]"
+        column_spec = if @row_header.nil?
+                        "/#{@table_column}[#{column}]"
+                      else
+                        if column == 1
+                          "/#{@row_header}"
+                        else
+                          "/#{@table_column}[#{column - 1}]"
+                        end
+                      end
       when :css
         if @table_section.nil?
           row_spec = "#{@locator} > #{@table_body} > #{@table_row}"
@@ -624,7 +649,16 @@ module TestCentricity
           row_spec = "#{@locator} > #{@table_body} > #{@table_section}"
           row_spec = "#{row_spec}:nth-of-type(#{row}) > #{@table_row}:nth-of-type(1)"
         end
-        column_spec = " > #{@table_column}:nth-of-type(#{column})"
+
+        column_spec = if @row_header.nil?
+                        " > #{@table_column}:nth-of-type(#{column})"
+                      else
+                        if column == 1
+                          " > #{@row_header}"
+                        else
+                          " > #{@table_column}:nth-of-type(#{column - 1})"
+                        end
+                      end
       end
       "#{row_spec}#{column_spec}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 3.2.16
+  version: 3.2.17
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler