page_object_wrapper 1.6.0 → 1.6.1

data/lib/page_object_wrapper/PageObject.rb

@@ -439,6 +439,21 @@ module PageObjectWrapper
       PageObjectWrapper.browser.instance_exec *args, &v.validate_block_value
     end
 
+    def get_cell_content cell
+      cell_content = rand(36**10).to_s(36)
+      begin
+        if cell.checkbox.exist?
+          cell_content = cell.checkbox.set?.to_s + cell.text
+        elsif cell.radio.exist?
+          cell_content = cell.radio.set?.to_s + cell.text
+        else
+          cell_content = cell.text
+        end
+      rescue Watir::Exception::UnknownObjectException
+      end
+      cell_content
+    end
+
     def select_from(table, header, *args)
       where = args[0]
       next_page = args[1]
@@ -472,34 +487,13 @@ module PageObjectWrapper
         else # finding by String or Regexp
           search_in_index = table.header_value.index(where.keys.first)
           t.rows.each{|r|
+            current_cell = r.cells[search_in_index]
             if search_value.is_a? String
-              begin 
-                if r.cells[search_in_index].checkbox.present? and r.cells[search_in_index].checkbox.set?.to_s == search_value
-                  found = r.cells[search_for_index] 
-                  break
-                elsif r.cells[search_in_index].radio.present? and r.cells[search_in_index].radio.set?.to_s == search_value
-                  found = r.cells[search_for_index] 
-                  break
-                elsif r.cells[search_in_index].text == search_value
-                  found = r.cells[search_for_index] 
-                  break
-                end
-              rescue Watir::Exception::UnknownObjectException
-                found = nil
-                next
-              end
+              cell_content = get_cell_content current_cell
+              found = r.cells[search_for_index] if cell_content == search_value
             elsif search_value.is_a? Regexp
-              begin
-                if search_value.match(r.cells[search_in_index].text)
-                  found = r.cells[search_for_index] 
-                  break
-                end
-              rescue Watir::Exception::UnknownObjectException
-                found = nil
-                next
-              end
-            else
-              raise ArgumentError, "#{search_value} not a Regexp or String"
+              cell_content = get_cell_content current_cell
+              found = r.cells[search_for_index] if search_value.match cell_content
             end
           }
         end
@@ -526,6 +520,8 @@ module PageObjectWrapper
       conditions = query.clone
       conditions.delete(:number)
       raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
+      t = PageObject.return_watir_element table
+      t.wait_until_present
       found_row = {}
       candidate_rows = nil
       raise ArgumentError, "argument should be a meaningful Hash, got #{query.inspect}" if not query.is_a?(Hash) or query.empty?
@@ -535,34 +531,25 @@ module PageObjectWrapper
       if not conditions.empty? and (conditions.keys.collect(&:class).uniq != [Symbol] or conditions.values.collect(&:class).uniq != [String])
         raise ArgumentError, "arguments hash should be like :symbol => 'a string' (for all columns except :number), got #{query.inspect}"
       end
-
-      t = PageObject.return_watir_element table
-      t.wait_until_present
       
       if query.has_key? :number
-        r = t[query[:number]]
+        candidate_rows = [t[query[:number]]]
         query.delete(:number)
+      else
+        candidate_rows = t.rows
+      end
+
+      candidate_rows.each{ |r|
         conditions_met = true
         unless query.empty?
           query.each_key{ |column_name|
             raise ArgumentError, "column #{column_name.inspect} not in table header and not == :number" if not table.header_value.include?(column_name) 
             column_index = table.header_value.index(column_name)
-            column_text = ''
-            # workaround for rows with small number of columns
-            begin
-              if r[column_index].checkbox.present?
-                column_text = r[column_index].checkbox.set?.to_s
-              elsif r[column_index].radio.present?
-                column_text = r[column_index].radio.set?.to_s
-              else
-                column_text = r[column_index].text
-              end
-            rescue Watir::Exception::UnknownObjectException
-              # just moving to next row
-              conditions_met = false
+            current_cell = r[column_index]
+            unless get_cell_content(current_cell) =~ /#{query[column_name]}/
+              conditions_met = false 
               break
             end
-            conditions_met = false if not column_text =~ /#{query[column_name]}/
           }
         end
         if conditions_met
@@ -573,44 +560,7 @@ module PageObjectWrapper
           }
           return found_row
         end
-      else
-        t.wait_until_present
-        t.rows.each{ |r|
-          r.wait_until_present
-          conditions_met = true
-          unless query.empty?
-            query.each_key{ |column_name|
-              raise ArgumentError, "column #{column_name.inspect} not in table header and not == :number" if not table.header_value.include?(column_name) 
-              column_index = table.header_value.index(column_name)
-              column_text = ''
-              # workaround for rows with small number of columns
-              begin
-                if r[column_index].checkbox.present?
-                  column_text = r[column_index].checkbox.set?.to_s
-                elsif r[column_index].radio.present?
-                  column_text = r[column_index].radio.set?.to_s
-                else
-                  column_text = r[column_index].text
-                end
-              rescue Watir::Exception::UnknownObjectException
-                # just moving to next row
-                conditions_met = false
-                break
-              end
-              conditions_met = false if not column_text =~ /#{query[column_name]}/
-            }
-          end
-          if conditions_met
-            column_index = 0
-            r.cells.each{ |cell| 
-              found_row[table.header_value[column_index]] = cell
-              column_index += 1
-            }
-            return found_row
-          end
-        }
-      end
-
+      }
       return nil
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PageObjectWrapper
-  VERSION = "1.6.0" unless const_defined?(:VERSION)
+  VERSION = "1.6.1" unless const_defined?(:VERSION)
 end

data/spec/select_from_xxx_spec.rb

@@ -76,7 +76,7 @@ describe "page_object.select_from_xxx" do
           it "returns found cells" do
             tp.select_from_table_without_header(:column_1, :column_1 => '103,000').text.should eq '103,000'
             tp.select_from_table_with_header(:checkbox, :total_area => '324,220').checkbox.should be_checked
-            tp.select_from_table_with_header(:country, :checkbox => 'false').text.should eq 'Denmark' # last found row
+            tp.select_from_table_with_header(:country, :checkbox => 'false').text.should eq 'Sweden' # last found row
             tp.select_from_table_with_header(:country, :checkbox => 'true').text.should eq 'Norway'
           end
           it "returns nil" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &24300100 !ruby/object:Gem::Requirement
+  requirement: &15182400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24300100
+  version_requirements: *15182400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &24299560 !ruby/object:Gem::Requirement
+  requirement: &15180620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24299560
+  version_requirements: *15180620
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &24299020 !ruby/object:Gem::Requirement
+  requirement: &15179680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24299020
+  version_requirements: *15179680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24298380 !ruby/object:Gem::Requirement
+  requirement: &15177100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *24298380
+  version_requirements: *15177100
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &24297780 !ruby/object:Gem::Requirement
+  requirement: &15174140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24297780
+  version_requirements: *15174140
 - !ruby/object:Gem::Dependency
   name: headless
-  requirement: &24297100 !ruby/object:Gem::Requirement
+  requirement: &15170740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24297100
+  version_requirements: *15170740
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email: