testcentricity_web 4.3.1 → 4.4.0

data/lib/testcentricity_web/web_elements/table.rb

@@ -1,341 +1,378 @@
 module TestCentricity
-  class Table < UIElement
-    attr_accessor :table_body
-    attr_accessor :table_section
-    attr_accessor :table_row
-    attr_accessor :table_column
-    attr_accessor :table_header
-    attr_accessor :header_row
-    attr_accessor :header_column
-    attr_accessor :row_header
-    attr_accessor :tree_expand
-    attr_accessor :tree_collapse
-
-    def initialize(name, parent, locator, context)
-      super
-      @type = :table
-
-      table_spec = {
-        table_body:    'tbody',
-        table_section: nil,
-        table_row:     'tr',
-        table_column:  'td',
-        table_header:  'thead',
-        header_row:    'tr',
-        header_column: 'th',
-        row_header:    nil
-      }
-
-      case @locator_type
-      when :xpath
-        table_spec[:tree_expand]   = "div/div[contains(@class, 'tree-plus treeclick')]"
-        table_spec[:tree_collapse] = "div/div[contains(@class, 'tree-minus treeclick')]"
-      when :css
-        table_spec[:tree_expand]   = "div > div[class*='tree-plus treeclick']"
-        table_spec[:tree_collapse] = "div > div[class*='tree-minus treeclick']"
-      end
-      define_table_elements(table_spec)
-    end
+  module Elements
+    class Table < UIElement
+      attr_accessor :table_body
+      attr_accessor :table_section
+      attr_accessor :table_row
+      attr_accessor :table_column
+      attr_accessor :table_header
+      attr_accessor :header_row
+      attr_accessor :header_column
+      attr_accessor :row_header
+      attr_accessor :tree_expand
+      attr_accessor :tree_collapse
+
+      def initialize(name, parent, locator, context)
+        super
+        @type = :table
+
+        table_spec = {
+          table_body:    'tbody',
+          table_section: nil,
+          table_row:     'tr',
+          table_column:  'td',
+          table_header:  'thead',
+          header_row:    'tr',
+          header_column: 'th',
+          row_header:    nil
+        }
 
-    def define_table_elements(element_spec)
-      element_spec.each do |element, value|
-        case element
-        when :table_body
-          @table_body = value
-        when :table_section
-          @table_section = 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
-        when :row_header
-          @row_header = value
-        when :tree_expand
-          @tree_expand = value
-        when :tree_collapse
-          @tree_collapse = value
-        else
-          raise "#{element} is not a recognized table element"
+        case @locator_type
+        when :xpath
+          table_spec[:tree_expand]   = "div/div[contains(@class, 'tree-plus treeclick')]"
+          table_spec[:tree_collapse] = "div/div[contains(@class, 'tree-minus treeclick')]"
+        when :css
+          table_spec[:tree_expand]   = "div > div[class*='tree-plus treeclick']"
+          table_spec[:tree_collapse] = "div > div[class*='tree-minus treeclick']"
         end
+        define_table_elements(table_spec)
       end
-    end
 
-    # Return number of rows in a table object.
-    #
-    # @return [Integer]
-    # @example
-    #   num_rows = list_table.get_row_count
-    #
-    def get_row_count
-      wait_until_exists(5)
-      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
+      def define_table_elements(element_spec)
+        element_spec.each do |element, value|
+          case element
+          when :table_body
+            @table_body = value
+          when :table_section
+            @table_section = 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
+          when :row_header
+            @row_header = value
+          when :tree_expand
+            @tree_expand = value
+          when :tree_collapse
+            @tree_collapse = value
+          else
+            raise "#{element} is not a recognized table element"
+          end
+        end
+      end
 
-    # Wait until the table's row count equals the specified value, or until the specified wait time has expired. If the wait
-    # time is nil, then the wait time will be Capybara.default_max_wait_time.
-    #
-    # @param value [Integer or Hash] value expected or comparison hash
-    # @param seconds [Integer or Float] wait time in seconds
-    # @example
-    #   list_table.wait_until_row_count_is(10, 15)
-    #     or
-    #   list_table.wait_until_row_count_is({ greater_than_or_equal: 1 }, 5)
-    #
-    def wait_until_row_count_is(value, seconds = nil, post_exception = true)
-      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
-      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
-      wait.until { compare(value, get_row_count) }
-    rescue
-      if post_exception
-        raise "Value of Table #{object_ref_message} failed to equal '#{value}' after #{timeout} seconds" unless get_row_count == value
-      else
-        get_row_count == value
+      # Return number of rows in a table object.
+      #
+      # @return [Integer]
+      # @example
+      #   num_rows = list_table.get_row_count
+      #
+      def get_row_count
+        wait_until_exists(5)
+        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
-    end
 
-    # Wait until the table's row count changes to a different value, or until the specified wait time has expired. If the
-    # wait time is nil, then the wait time will be Capybara.default_max_wait_time.
-    #
-    # @param seconds [Integer or Float] wait time in seconds
-    # @example
-    #   list_table.wait_until_row_count_changes(5)
-    #
-    def wait_until_row_count_changes(seconds = nil, post_exception = true)
-      value = get_row_count
-      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
-      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
-      wait.until { get_row_count != value }
-    rescue
-      if post_exception
-        raise "Value of Table #{object_ref_message} failed to change from '#{value}' after #{timeout} seconds" if get_row_count == value
-      else
-        get_row_count == value
+      # Wait until the table's row count equals the specified value, or until the specified wait time has expired. If the wait
+      # time is nil, then the wait time will be Capybara.default_max_wait_time.
+      #
+      # @param value [Integer or Hash] value expected or comparison hash
+      # @param seconds [Integer or Float] wait time in seconds
+      # @example
+      #   list_table.wait_until_row_count_is(10, 15)
+      #     or
+      #   list_table.wait_until_row_count_is({ greater_than_or_equal: 1 }, 5)
+      #
+      def wait_until_row_count_is(value, seconds = nil, post_exception = true)
+        timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+        wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+        wait.until { compare(value, get_row_count) }
+      rescue
+        if post_exception
+          raise "Value of Table #{object_ref_message} failed to equal '#{value}' after #{timeout} seconds" unless get_row_count == value
+        else
+          get_row_count == value
+        end
       end
-    end
 
-    # Return number of columns in a table object.
-    #
-    # @return [Integer]
-    # @example
-    #   num_columns = list_table.get_column_count
-    #
-    def get_column_count
-      row_count = get_row_count
-      case @locator_type
-      when :xpath
-        delimiter = "/"
-        index = "[2]"
-      when :css
-        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
+      # Wait until the table's row count changes to a different value, or until the specified wait time has expired. If the
+      # wait time is nil, then the wait time will be Capybara.default_max_wait_time.
+      #
+      # @param seconds [Integer or Float] wait time in seconds
+      # @example
+      #   list_table.wait_until_row_count_changes(5)
+      #
+      def wait_until_row_count_changes(seconds = nil, post_exception = true)
+        value = get_row_count
+        timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+        wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+        wait.until { get_row_count != value }
+      rescue
+        if post_exception
+          raise "Value of Table #{object_ref_message} failed to change from '#{value}' after #{timeout} seconds" if get_row_count == value
+        else
+          get_row_count == value
+        end
+      end
+
+      # Return number of columns in a table object.
+      #
+      # @return [Integer]
+      # @example
+      #   num_columns = list_table.get_column_count
+      #
+      def get_column_count
+        row_count = get_row_count
+        case @locator_type
+        when :xpath
+          delimiter = "/"
+          index = "[2]"
+        when :css
+          delimiter = " > "
+          index = ":nth-of-type(2)"
+        end
+        path = if row_count.zero?
+                 "#{@locator}#{delimiter}#{@table_header}#{delimiter}#{@header_row}#{delimiter}#{@header_column}"
                else
-                 if row_count == 1
-                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{delimiter}#{@table_row}#{delimiter}#{@table_column}"
+                 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
-                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{index}#{delimiter}#{@table_row}#{delimiter}#{@table_column}"
+                   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
-             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}"
+        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
-                   "#{@locator}#{delimiter}#{@table_body}#{delimiter}#{@table_section}#{index}#{delimiter}#{@table_row}#{delimiter}#{@row_header}"
+                   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
-               end
-        cols + page.all(@locator_type, path, visible: :all).count
+          cols + page.all(@locator_type, path, visible: :all).count
+        end
       end
-    end
 
-    # Hover over the specified cell in a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @example
-    #   list_table.hover_table_cell(2, 6)
-    #
-    def hover_table_cell(row, column)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      hover
-      clear_alt_locator
-    end
-
-    # Click in the specified cell in a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @example
-    #   list_table.click_table_cell(3, 5)
-    #
-    def click_table_cell(row, column)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      click
-      clear_alt_locator
-    end
+      # Hover over the specified cell in a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @example
+      #   list_table.hover_table_cell(2, 6)
+      #
+      def hover_table_cell(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        set_table_cell_locator(row, column)
+        hover
+        clear_alt_locator
+      end
 
-    # Double-click in the specified cell in a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @example
-    #   list_table.double_click_table_cell(3, 5)
-    #
-    def double_click_table_cell(row, column)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      double_click
-      clear_alt_locator
-    end
+      # Click in the specified cell in a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @example
+      #   list_table.click_table_cell(3, 5)
+      #
+      def click_table_cell(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        set_table_cell_locator(row, column)
+        click
+        clear_alt_locator
+      end
 
-    # Click the link object embedded within the specified cell in a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @example
-    #   list_table.click_table_cell_link(3, 1)
-    #
-    def click_table_cell_link(row, column)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      saved_locator = @alt_locator
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{@alt_locator}//a")
-        set_alt_locator("#{saved_locator}//span/a") unless exists?
-        # if link not present, check for text entry fields and try to dismiss by tabbing out
-        unless exists?
-          set_alt_locator("#{saved_locator}//input")
-          set_alt_locator("#{saved_locator}//textarea") unless exists?
-          send_keys(:tab) if exists?
-          set_alt_locator("#{saved_locator}//a")
-          set_alt_locator("#{saved_locator}//span/a") unless exists?
-          send_keys(:tab) unless exists?
-        end
-      when :css
-        set_alt_locator("#{@alt_locator} a")
-        set_alt_locator("#{saved_locator} span > a") unless exists?
-        # if link not present, check for text entry fields and try to dismiss by tabbing out
-        unless exists?
-          set_alt_locator("#{saved_locator} input")
-          set_alt_locator("#{saved_locator} textarea") unless exists?
-          send_keys(:tab) if exists?
-          set_alt_locator("#{saved_locator} a")
-          set_alt_locator("#{saved_locator} span > a") unless exists?
-          send_keys(:tab) unless exists?
-        end
+      # Double-click in the specified cell in a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @example
+      #   list_table.double_click_table_cell(3, 5)
+      #
+      def double_click_table_cell(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        set_table_cell_locator(row, column)
+        double_click
+        clear_alt_locator
       end
-      wait_until_exists(1)
-      click
-      clear_alt_locator
-    end
 
-    def get_table_row(row)
-      columns = []
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      (1..column_count).each do |column|
-        value = ''
+      # Click the link object embedded within the specified cell in a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @example
+      #   list_table.click_table_cell_link(3, 1)
+      #
+      def click_table_cell_link(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
         set_table_cell_locator(row, column)
         saved_locator = @alt_locator
         case @locator_type
         when :xpath
-          set_alt_locator("#{saved_locator}//input")
+          set_alt_locator("#{@alt_locator}//a")
+          set_alt_locator("#{saved_locator}//span/a") unless exists?
+          # if link not present, check for text entry fields and try to dismiss by tabbing out
           unless exists?
-            set_alt_locator("#{saved_locator}//textarea")
-            set_alt_locator(saved_locator) unless exists?
+            set_alt_locator("#{saved_locator}//input")
+            set_alt_locator("#{saved_locator}//textarea") unless exists?
+            send_keys(:tab) if exists?
+            set_alt_locator("#{saved_locator}//a")
+            set_alt_locator("#{saved_locator}//span/a") unless exists?
+            send_keys(:tab) unless exists?
           end
         when :css
-          set_alt_locator("#{saved_locator} input")
+          set_alt_locator("#{@alt_locator} a")
+          set_alt_locator("#{saved_locator} span > a") unless exists?
+          # if link not present, check for text entry fields and try to dismiss by tabbing out
           unless exists?
-            set_alt_locator("#{saved_locator} textarea")
-            set_alt_locator(saved_locator) unless exists?
+            set_alt_locator("#{saved_locator} input")
+            set_alt_locator("#{saved_locator} textarea") unless exists?
+            send_keys(:tab) if exists?
+            set_alt_locator("#{saved_locator} a")
+            set_alt_locator("#{saved_locator} span > a") unless exists?
+            send_keys(:tab) unless exists?
           end
         end
-        value = get_value if exists?
-        columns.push(value)
+        wait_until_exists(1)
+        click
+        clear_alt_locator
+      end
+
+      def get_table_row(row)
+        columns = []
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        (1..column_count).each do |column|
+          value = ''
+          set_table_cell_locator(row, column)
+          saved_locator = @alt_locator
+          case @locator_type
+          when :xpath
+            set_alt_locator("#{saved_locator}//input")
+            unless exists?
+              set_alt_locator("#{saved_locator}//textarea")
+              set_alt_locator(saved_locator) unless exists?
+            end
+          when :css
+            set_alt_locator("#{saved_locator} input")
+            unless exists?
+              set_alt_locator("#{saved_locator} textarea")
+              set_alt_locator(saved_locator) unless exists?
+            end
+          end
+          value = get_value if exists?
+          columns.push(value)
+        end
+        clear_alt_locator
+        columns
       end
-      clear_alt_locator
-      columns
-    end
 
-    def get_row_data(row)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      case @locator_type
-      when :xpath
-        row > 1 ?
+      def get_row_data(row)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        case @locator_type
+        when :xpath
+          row > 1 ?
             set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}[#{row}]") :
             set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}")
-      when :css
-        row > 1 ?
+        when :css
+          row > 1 ?
             set_alt_locator("#{@locator} > #{@table_body} > #{@table_row}:nth-of-type(#{row})") :
             set_alt_locator("#{@locator} > #{@table_body} > #{@table_row}")
+        end
+        value = get_value if exists?
+        clear_alt_locator
+        value
       end
-      value = get_value if exists?
-      clear_alt_locator
-      value
-    end
 
-    def get_table_column(column)
-      rows = []
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      row_count = get_row_count
-      (1..row_count).each do |row|
-        value = ''
+      def get_table_column(column)
+        rows = []
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        row_count = get_row_count
+        (1..row_count).each do |row|
+          value = ''
+          set_table_cell_locator(row, column)
+          saved_locator = @alt_locator
+          case @locator_type
+          when :xpath
+            set_alt_locator("#{saved_locator}//input")
+            unless exists?
+              set_alt_locator("#{saved_locator}//textarea")
+              set_alt_locator(saved_locator) unless exists?
+            end
+          when :css
+            set_alt_locator("#{saved_locator} input")
+            unless exists?
+              set_alt_locator("#{saved_locator} textarea")
+              set_alt_locator(saved_locator) unless exists?
+            end
+          end
+          value = get_value if exists?
+          rows.push(value)
+        end
+        clear_alt_locator
+        rows
+      end
+
+      # Return text contained in specified cell of a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @return [String] value of table cell
+      # @example
+      #   list_table.get_table_cell(4, 5)
+      #
+      def get_table_cell(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
         set_table_cell_locator(row, column)
         saved_locator = @alt_locator
         case @locator_type
@@ -352,338 +389,303 @@ module TestCentricity
             set_alt_locator(saved_locator) unless exists?
           end
         end
-        value = get_value if exists?
-        rows.push(value)
-      end
-      clear_alt_locator
-      rows
-    end
-
-    # Return text contained in specified cell of a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @return [String] value of table cell
-    # @example
-    #   list_table.get_table_cell(4, 5)
-    #
-    def get_table_cell(row, column)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      saved_locator = @alt_locator
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{saved_locator}//input")
-        unless exists?
-          set_alt_locator("#{saved_locator}//textarea")
-          set_alt_locator(saved_locator) unless exists?
-        end
-      when :css
-        set_alt_locator("#{saved_locator} input")
-        unless exists?
-          set_alt_locator("#{saved_locator} textarea")
-          set_alt_locator(saved_locator) unless exists?
+        if exists?
+          value = get_value
+        else
+          puts "Could not find table cell at #{@alt_locator}"
+          value = ''
         end
+        clear_alt_locator
+        value
       end
-      if exists?
-        value = get_value
-      else
-        puts "Could not find table cell at #{@alt_locator}"
-        value = ''
-      end
-      clear_alt_locator
-      value
-    end
 
-    def verify_table_cell(row, column, expected, enqueue = false)
-      actual = get_table_cell(row, column)
-      enqueue ?
+      def verify_table_cell(row, column, expected, enqueue = false)
+        actual = get_table_cell(row, column)
+        enqueue ?
           ExceptionQueue.enqueue_assert_equal(expected.strip, actual.strip, "Expected table #{object_ref_message} row #{row}/column #{column}") :
           assert_equal(expected.strip, actual.strip, "Expected table #{object_ref_message} row #{row}/column #{column} to display '#{expected}' but found '#{actual}'")
-    end
+      end
 
-    # Set the value of the specified cell in a table object.
-    #
-    # @param row [Integer] row number
-    # @param column [Integer] column number
-    # @param value [String] text to set
-    # @example
-    #   list_table.set_table_cell(3, 1, 'Ontario')
-    #
-    def set_table_cell(row, column, value)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      find_table_cell(row, column)
-      find_table_cell(row, column) unless exists?
-      set(value)
-      clear_alt_locator
-    end
+      # Set the value of the specified cell in a table object.
+      #
+      # @param row [Integer] row number
+      # @param column [Integer] column number
+      # @param value [String] text to set
+      # @example
+      #   list_table.set_table_cell(3, 1, 'Ontario')
+      #
+      def set_table_cell(row, column, value)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        find_table_cell(row, column)
+        find_table_cell(row, column) unless exists?
+        set(value)
+        clear_alt_locator
+      end
 
-    def get_cell_attribute(row, column, attrib)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      result = get_native_attribute(attrib)
-      clear_alt_locator
-      result
-    end
+      def get_cell_attribute(row, column, attrib)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        set_table_cell_locator(row, column)
+        result = get_native_attribute(attrib)
+        clear_alt_locator
+        result
+      end
 
-    def get_row_attribute(row, attrib)
-      row_count = get_row_count
-      raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      case @locator_type
-      when :xpath
-        row > 1 ?
+      def get_row_attribute(row, attrib)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        case @locator_type
+        when :xpath
+          row > 1 ?
             set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}[#{row}]") :
             set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}")
-      when :css
-        row > 1 ?
+        when :css
+          row > 1 ?
             set_alt_locator("#{@locator} > #{@table_body} > #{@table_row}:nth-of-type(#{row})") :
             set_alt_locator("#{@locator} > #{@table_body} > #{@table_row}")
+        end
+        result = get_native_attribute(attrib)
+        clear_alt_locator
+        result
       end
-      result = get_native_attribute(attrib)
-      clear_alt_locator
-      result
-    end
 
-    def find_row_attribute(attrib, search_value)
-      (1..get_row_count).each do |row|
-        return row if get_row_attribute(row, attrib) == search_value
+      def find_row_attribute(attrib, search_value)
+        (1..get_row_count).each do |row|
+          return row if get_row_attribute(row, attrib) == search_value
+        end
+        nil
       end
-      nil
-    end
 
-    # Search for the specified text value in the specified row of the table object.
-    # Returns the number of the first column that contains the search value.
-    #
-    # @param row [Integer] row nummber
-    # @param search_value [String] value to be searched for
-    # @return [Integer] column number of table cell that contains search value
-    # @example
-    #   bom_table.find_in_table_row(4, 'High-speed Framus bolts')
-    #
-    def find_in_table_row(row, search_value)
-      (1..get_column_count).each do |column|
-        return column if get_table_cell(row, column) == search_value
-      end
-      nil
-    end
+      # Search for the specified text value in the specified row of the table object.
+      # Returns the number of the first column that contains the search value.
+      #
+      # @param row [Integer] row nummber
+      # @param search_value [String] value to be searched for
+      # @return [Integer] column number of table cell that contains search value
+      # @example
+      #   bom_table.find_in_table_row(4, 'High-speed Framus bolts')
+      #
+      def find_in_table_row(row, search_value)
+        (1..get_column_count).each do |column|
+          return column if get_table_cell(row, column) == search_value
+        end
+        nil
+      end
 
-    # Search for the specified text value in the specified column of the table object.
-    # Returns the number of the first row that contains the search value.
-    #
-    # @param column [Integer] column nummber
-    # @param search_value [String] value to be searched for
-    # @return [Integer] row number of table cell that contains search value
-    # @example
-    #   playlist_table.find_in_table_column(1, 'Ashes to Ashes')
-    #
-    def find_in_table_column(column, search_value)
-      (1..get_row_count).each do |row|
-        return row if get_table_cell(row, column) == search_value
-      end
-      nil
-    end
+      # Search for the specified text value in the specified column of the table object.
+      # Returns the number of the first row that contains the search value.
+      #
+      # @param column [Integer] column nummber
+      # @param search_value [String] value to be searched for
+      # @return [Integer] row number of table cell that contains search value
+      # @example
+      #   playlist_table.find_in_table_column(1, 'Ashes to Ashes')
+      #
+      def find_in_table_column(column, search_value)
+        (1..get_row_count).each do |row|
+          return row if get_table_cell(row, column) == search_value
+        end
+        nil
+      end
 
-    # Populate the specified row of this table object with the associated data from a Hash passed as an
-    # argument. Data values must be in the form of a String for textfield and select list controls. For checkbox
-    # and radio buttons, data must either be a Boolean or a String that evaluates to a Boolean value (Yes, No, 1,
-    # 0, true, false)
-    #
-    # @param data [Hash] column numbers and associated data to be entered
-    # @example
-    #   data = { 1 => 'Dr.',
-    #            2 => 'Evangeline',
-    #            3 => 'Devereaux',
-    #            4 => 'MD',
-    #            5 => 'Family Practice'
-    #          }
-    #   clinicians_table.populate_table_row(3, data)
-    #
-    def populate_table_row(row, data)
-      wait_until_exists(2)
-      data.each do |column, data_param|
-        unless data_param.blank?
-          if data_param == '!DELETE'
-            set_table_cell(row, column, '')
-          else
-            set_table_cell(row, column, data_param)
+      # Populate the specified row of this table object with the associated data from a Hash passed as an
+      # argument. Data values must be in the form of a String for textfield and select list controls. For checkbox
+      # and radio buttons, data must either be a Boolean or a String that evaluates to a Boolean value (Yes, No, 1,
+      # 0, true, false)
+      #
+      # @param data [Hash] column numbers and associated data to be entered
+      # @example
+      #   data = { 1 => 'Dr.',
+      #            2 => 'Evangeline',
+      #            3 => 'Devereaux',
+      #            4 => 'MD',
+      #            5 => 'Family Practice'
+      #          }
+      #   clinicians_table.populate_table_row(3, data)
+      #
+      def populate_table_row(row, data)
+        wait_until_exists(2)
+        data.each do |column, data_param|
+          unless data_param.blank?
+            if data_param == '!DELETE'
+              set_table_cell(row, column, '')
+            else
+              set_table_cell(row, column, data_param)
+            end
           end
         end
       end
-    end
-
-    # Click in the specified column header in a table object.
-    #
-    # @param column [Integer] column number
-    # @example
-    #   list_table.click_header_column(3)
-    #
-    def click_header_column(column)
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{object_ref_message}" if column > column_count
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
-      when :css
-        set_alt_locator("#{@locator} #{@table_header} > #{@header_row} > #{@header_column}:nth-of-type(#{column})")
-      end
-      click if exists?
-      clear_alt_locator
-    end
-
-    def get_header_column(column)
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{object_ref_message}" if column > column_count
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
-      when :css
-        set_alt_locator("#{@locator} #{@table_header} > #{@header_row} > #{@header_column}:nth-of-type(#{column})")
-      end
-      value = get_value(:all) if exists?(:all)
-      clear_alt_locator
-      value
-    end
 
-    def get_header_columns
-      columns = []
-      column_count = get_column_count
-      (1..column_count).each do |column|
+      # Click in the specified column header in a table object.
+      #
+      # @param column [Integer] column number
+      # @example
+      #   list_table.click_header_column(3)
+      #
+      def click_header_column(column)
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{object_ref_message}" if column > column_count
         case @locator_type
         when :xpath
           set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
         when :css
           set_alt_locator("#{@locator} #{@table_header} > #{@header_row} > #{@header_column}:nth-of-type(#{column})")
         end
-        columns.push(get_value(:all)) if exists?(:all)
+        click if exists?
+        clear_alt_locator
       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 #{object_ref_message}" if row > row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      set_table_cell_locator(row, column)
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{@alt_locator}/#{@tree_expand}")
-      when :css
-        set_alt_locator("#{@alt_locator} > #{@tree_expand}")
-      end
-      expanded = true
-      expanded = false if exists?
-      clear_alt_locator
-      expanded
-    end
-
-    def expand_table_row(row, column)
-      unless is_table_row_expanded?(row, column)
-        set_table_cell_locator(row, column)
+      def get_header_column(column)
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table header #{object_ref_message}" if column > column_count
         case @locator_type
         when :xpath
-          set_alt_locator("#{@alt_locator}/#{@tree_expand}")
+          set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
         when :css
-          set_alt_locator("#{@alt_locator} > #{@tree_expand}")
+          set_alt_locator("#{@locator} #{@table_header} > #{@header_row} > #{@header_column}:nth-of-type(#{column})")
         end
-        click if exists?
+        value = get_value(:all) if exists?(:all)
         clear_alt_locator
+        value
+      end
+
+      def get_header_columns
+        columns = []
+        column_count = get_column_count
+        (1..column_count).each do |column|
+          case @locator_type
+          when :xpath
+            set_alt_locator("#{@locator}//#{@table_header}/#{@header_row}/#{@header_column}[#{column}]")
+          when :css
+            set_alt_locator("#{@locator} #{@table_header} > #{@header_row} > #{@header_column}:nth-of-type(#{column})")
+          end
+          columns.push(get_value(:all)) if exists?(:all)
+        end
+        clear_alt_locator
+        columns
       end
-    end
 
-    def collapse_table_row(row, column)
-      if is_table_row_expanded?(row, column)
+      def is_table_row_expanded?(row, column)
+        row_count = get_row_count
+        raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
         set_table_cell_locator(row, column)
         case @locator_type
         when :xpath
-          set_alt_locator("#{@alt_locator}/#{@tree_collapse}")
+          set_alt_locator("#{@alt_locator}/#{@tree_expand}")
         when :css
-          set_alt_locator("#{@alt_locator} > #{@tree_collapse}")
+          set_alt_locator("#{@alt_locator} > #{@tree_expand}")
         end
-        click if exists?
+        expanded = true
+        expanded = false if exists?
         clear_alt_locator
+        expanded
       end
-    end
 
-    def expand_all_table_rows(column)
-      row_count = get_row_count
-      column_count = get_column_count
-      raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
-      row_count.downto(1) do |row|
-        expand_table_row(row, column)
+      def expand_table_row(row, column)
+        unless is_table_row_expanded?(row, column)
+          set_table_cell_locator(row, column)
+          case @locator_type
+          when :xpath
+            set_alt_locator("#{@alt_locator}/#{@tree_expand}")
+          when :css
+            set_alt_locator("#{@alt_locator} > #{@tree_expand}")
+          end
+          click if exists?
+          clear_alt_locator
+        end
       end
-    end
 
-    def get_table_cell_locator(row, column)
-      case @locator_type
-      when :xpath
-        if @table_section.nil?
-          row_spec = "#{@locator}/#{@table_body}/#{@table_row}"
-          row_spec = "#{row_spec}[#{row}]"
-        else
-          row_spec = "#{@locator}/#{@table_body}/#{@table_section}"
-          row_spec = "#{row_spec}[#{row}]/#{@table_row}[1]"
+      def collapse_table_row(row, column)
+        if is_table_row_expanded?(row, column)
+          set_table_cell_locator(row, column)
+          case @locator_type
+          when :xpath
+            set_alt_locator("#{@alt_locator}/#{@tree_collapse}")
+          when :css
+            set_alt_locator("#{@alt_locator} > #{@tree_collapse}")
+          end
+          click if exists?
+          clear_alt_locator
+        end
+      end
+
+      def expand_all_table_rows(column)
+        row_count = get_row_count
+        column_count = get_column_count
+        raise "Column #{column} exceeds number of columns (#{column_count}) in table #{object_ref_message}" if column > column_count
+        row_count.downto(1) do |row|
+          expand_table_row(row, column)
         end
-        column_spec = if @row_header.nil?
-                        "/#{@table_column}[#{column}]"
-                      else
-                        if column == 1
-                          "/#{@row_header}"
+      end
+
+      def get_table_cell_locator(row, column)
+        case @locator_type
+        when :xpath
+          if @table_section.nil?
+            row_spec = "#{@locator}/#{@table_body}/#{@table_row}"
+            row_spec = "#{row_spec}[#{row}]"
+          else
+            row_spec = "#{@locator}/#{@table_body}/#{@table_section}"
+            row_spec = "#{row_spec}[#{row}]/#{@table_row}[1]"
+          end
+          column_spec = if @row_header.nil?
+                          "/#{@table_column}[#{column}]"
                         else
-                          "/#{@table_column}[#{column - 1}]"
+                          if column == 1
+                            "/#{@row_header}"
+                          else
+                            "/#{@table_column}[#{column - 1}]"
+                          end
                         end
-                      end
-      when :css
-        if @table_section.nil?
-          row_spec = "#{@locator} > #{@table_body} > #{@table_row}"
-          row_spec = "#{row_spec}:nth-of-type(#{row})"
-        else
-          row_spec = "#{@locator} > #{@table_body} > #{@table_section}"
-          row_spec = "#{row_spec}:nth-of-type(#{row}) > #{@table_row}:nth-of-type(1)"
-        end
+        when :css
+          if @table_section.nil?
+            row_spec = "#{@locator} > #{@table_body} > #{@table_row}"
+            row_spec = "#{row_spec}:nth-of-type(#{row})"
+          else
+            row_spec = "#{@locator} > #{@table_body} > #{@table_section}"
+            row_spec = "#{row_spec}:nth-of-type(#{row}) > #{@table_row}:nth-of-type(1)"
+          end
 
-        column_spec = if @row_header.nil?
-                        " > #{@table_column}:nth-of-type(#{column})"
-                      else
-                        if column == 1
-                          " > #{@row_header}"
+          column_spec = if @row_header.nil?
+                          " > #{@table_column}:nth-of-type(#{column})"
                         else
-                          " > #{@table_column}:nth-of-type(#{column - 1})"
+                          if column == 1
+                            " > #{@row_header}"
+                          else
+                            " > #{@table_column}:nth-of-type(#{column - 1})"
+                          end
                         end
-                      end
+        end
+        "#{row_spec}#{column_spec}"
       end
-      "#{row_spec}#{column_spec}"
-    end
 
-    private
+      private
 
-    def set_table_cell_locator(row, column)
-      set_alt_locator(get_table_cell_locator(row, column))
-    end
+      def set_table_cell_locator(row, column)
+        set_alt_locator(get_table_cell_locator(row, column))
+      end
 
-    def find_table_cell(row, column)
-      set_table_cell_locator(row, column)
-      if exists?
-        click
-      else
-        puts "Could not find table cell at #{@alt_locator}"
-      end
-      saved_locator = @alt_locator
-      case @locator_type
-      when :xpath
-        set_alt_locator("#{saved_locator}//input")
-        set_alt_locator("#{saved_locator}//textarea") unless exists?
-      when :css
-        set_alt_locator("#{saved_locator} input")
-        set_alt_locator("#{saved_locator} textarea") unless exists?
+      def find_table_cell(row, column)
+        set_table_cell_locator(row, column)
+        if exists?
+          click
+        else
+          puts "Could not find table cell at #{@alt_locator}"
+        end
+        saved_locator = @alt_locator
+        case @locator_type
+        when :xpath
+          set_alt_locator("#{saved_locator}//input")
+          set_alt_locator("#{saved_locator}//textarea") unless exists?
+        when :css
+          set_alt_locator("#{saved_locator} input")
+          set_alt_locator("#{saved_locator} textarea") unless exists?
+        end
       end
     end
   end