page_object_wrapper 1.5.3 → 1.5.4

data/good_pages/some_test_page.html

@@ -254,7 +254,8 @@ attributes:</p>
 <TABLE summary=
 "Each row names a Nordic country and specifies its total area and land area, in square kilometers">
 <CAPTION>Sample table: Areas of the Nordic countries, in sq km</CAPTION>
-<TR><th scope="col">Country</th> <th scope="col">Total area</TH> <th scope="col">Land area</TH> <th scope="col">Link</TH><TH>Checkboxes</TH>
+<TR><th scope="col">Country</th> <th scope="col">Total area</th> <th scope="col">Land area</th> <th scope="col">Link</th><th>Checkboxes</th></TR>
+<TR><th>One column row</th></TR>
   <TR><th scope="row">Denmark</TH> <TD ALIGN=RIGHT> 43,070 </TD><TD ALIGN=RIGHT> 42,370</TD> <TD ALIGN=RIGHT> <a href="http://denmark.dk/">D</a></TD> <TD><input type="checkbox"></TD></TR> 
   <TR><th scope="row">Finland</TH> <TD ALIGN=RIGHT>337,030 </TD><TD ALIGN=RIGHT>305,470</TD> <TD ALIGN=RIGHT> <a href="http://www.visitfinland.com/ru/">Finland</a></TD><TD><input type="checkbox"></TD></TR> 
   <TR><th scope="row">Iceland</TH> <TD ALIGN=RIGHT>103,000 </TD><TD ALIGN=RIGHT>100,250</TD> <TD ALIGN=RIGHT> No </TD><TD><input type="checkbox"></TD></TR> 

data/lib/page_object_wrapper/PageObject.rb

@@ -477,6 +477,7 @@ module PageObjectWrapper
                 end
               rescue Watir::Exception::UnknownObjectException
                 found = nil
+                next
               end
             elsif search_value.is_a? Regexp
               begin
@@ -486,6 +487,7 @@ module PageObjectWrapper
                 end
               rescue Watir::Exception::UnknownObjectException
                 found = nil
+                next
               end
             else
               raise ArgumentError, "#{search_value} not a Regexp or String"
@@ -541,12 +543,19 @@ module PageObjectWrapper
             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 = ''
-            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
+            # 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 column_text != query[column_name]
           }

data/lib/version.rb

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

data/spec/select_from_xxx_spec.rb

@@ -58,9 +58,9 @@ describe "page_object.select_from_xxx" do
     context "where == nil" do
       context "next_page not specified" do
         it "returns middle row value from provided column" do
-          tp.select_from_table_without_header(:column_0).text.should eq 'Iceland'
-          tp.select_from_table_without_header(:column_1).text.should eq '103,000'
-          tp.select_from_table_without_header(:column_2).text.should eq '100,250'
+          tp.select_from_table_without_header(:column_0).text.should eq 'Finland'
+          tp.select_from_table_without_header(:column_1).text.should eq '337,030'
+          tp.select_from_table_without_header(:column_2).text.should eq '305,470'
         end
       end
       context "next_page specified" do
@@ -74,8 +74,8 @@ describe "page_object.select_from_xxx" do
       context "next_page not specified" do
         context "found by String" do
           it "returns found cells" do
-            tp.select_from_table_without_header(:column_0, :column_1 => '103,000').text.should eq 'Iceland'
-            tp.select_from_table_with_header(:country, :total_area => '337,030').text.should eq 'Finland'
+            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 => 'true').text.should eq 'Norway'
           end
@@ -98,8 +98,8 @@ describe "page_object.select_from_xxx" do
         end
         context "found by row number" do
           it "returns found cells" do
-            tp.select_from_table_without_header(:column_0, :row => 2).text.should eq 'Finland'
-            tp.select_from_table_with_header(:country, :row => 3).text.should eq 'Iceland'
+            tp.select_from_table_without_header(:column_0, :row => 3).text.should eq 'Finland'
+            tp.select_from_table_with_header(:country, :row => 4).text.should eq 'Iceland'
           end
           it "returns nil" do
             tp.select_from_table_with_header(:country, :row => 123).should eq nil
@@ -125,8 +125,8 @@ describe "page_object.select_from_xxx" do
         end
         context "found by row number" do
           it "returns found cells" do
-            tp.select_from_table_without_header(:column_0, {:row => 2}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
-            tp.select_from_table_with_header(:country, {:row => 3}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
+            tp.select_from_table_without_header(:column_0, {:row => 3}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
+            tp.select_from_table_with_header(:country, {:row => 4}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
           end
           it "returns nil" do
             tp.select_from_table_with_header(:country, {:row => 123}, :some_test_page).should eq nil

data/spec/select_row_from_xxx_spec.rb

@@ -42,13 +42,13 @@ describe "page_object.select_from_xxx" do
 
     context "table with header" do
       it "returns first found row excluding table header" do
-        t_row = tp.select_row_from_table_with_header(:number => 1)
+        t_row = tp.select_row_from_table_with_header(:number => 2)
         t_row.should be_a Hash
-        t_row[:country].text.should eq 'Denmark'
+        t_row[:land_area].text.should eq '42,370'
         t_row = tp.select_row_from_table_with_header(:country => 'Denmark')
         t_row.should be_a Hash
         t_row[:country].text.should eq 'Denmark'
-        t_row = tp.select_row_from_table_with_header(:number => 1, :country => 'Denmark')
+        t_row = tp.select_row_from_table_with_header(:number => 2, :country => 'Denmark')
         t_row.should be_a Hash
         t_row[:country].text.should eq 'Denmark'
         t_row = tp.select_row_from_table_with_header(:checkbox => 'false')
@@ -62,7 +62,7 @@ describe "page_object.select_from_xxx" do
 
     context "table without header" do
       it "returns first found row including table header" do
-        t_row = tp.select_row_from_table_without_header(:number => 1)
+        t_row = tp.select_row_from_table_without_header(:number => 2)
         t_row.should be_a Hash
         t_row[:column_0].text.should eq 'Denmark'
         t_row = tp.select_row_from_table_without_header(:column_0 => 'Denmark')
@@ -71,7 +71,7 @@ describe "page_object.select_from_xxx" do
         t_row = tp.select_row_from_table_without_header(:column_4 => 'false')
         t_row.should be_a Hash
         t_row[:column_0].text.should eq 'Denmark'
-        t_row = tp.select_row_from_table_without_header(:number => 1, :column_0 => 'Denmark')
+        t_row = tp.select_row_from_table_without_header(:number => 2, :column_0 => 'Denmark')
         t_row.should be_a Hash
         t_row[:column_0].text.should eq 'Denmark'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &19895960 !ruby/object:Gem::Requirement
+  requirement: &20960480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19895960
+  version_requirements: *20960480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19894760 !ruby/object:Gem::Requirement
+  requirement: &20959820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19894760
+  version_requirements: *20959820
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &19893720 !ruby/object:Gem::Requirement
+  requirement: &20959380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19893720
+  version_requirements: *20959380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19892900 !ruby/object:Gem::Requirement
+  requirement: &20958840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *19892900
+  version_requirements: *20958840
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &19892300 !ruby/object:Gem::Requirement
+  requirement: &20974600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19892300
+  version_requirements: *20974600
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email: