page_object_wrapper 1.5.1 → 1.5.2

data/good_pages/pagination_example_page.rb

@@ -29,6 +29,6 @@ PageObjectWrapper.define_page(:google_invalid_pagination) do
   uniq_input :id => 'gbqfq'
 
   pagination :invalid_pagination do
-    locator "table(:id => 'nav').tr.td.a(:text => '1000')", '1000'
+    locator "table(:id => 'nav').tr.td.a(:text => '10')", '10'
   end
 end

data/good_pages/some_test_page.html

@@ -254,12 +254,12 @@ 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>
-<TR><th scope="row">Denmark</TH> <TD ALIGN=RIGHT> 43,070 </TD><TD ALIGN=RIGHT> 42,370</TR>
-<TR><th scope="row">Finland</TH> <TD ALIGN=RIGHT>337,030 </TD><TD ALIGN=RIGHT>305,470</TR>
-<TR><th scope="row">Iceland</TH> <TD ALIGN=RIGHT>103,000 </TD><TD ALIGN=RIGHT>100,250</TR>
-<TR><th scope="row">Norway</TH>  <TD ALIGN=RIGHT>324,220 </TD><TD ALIGN=RIGHT>307,860</TR>
-<TR><th scope="row">Sweden</TH>  <TD ALIGN=RIGHT>449,964 </TD><TD ALIGN=RIGHT>410,928</TR>
+<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="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> 
+  <TR><th scope="row">Norway</TH>  <TD ALIGN=RIGHT>324,220 </TD><TD ALIGN=RIGHT>307,860</TD> <TD ALIGN=RIGHT> No </TD><TD><input type="checkbox" checked></TD></TR> 
+  <TR><th scope="row">Sweden</TH>  <TD ALIGN=RIGHT>449,964 </TD><TD ALIGN=RIGHT>410,928</TD> <TD ALIGN=RIGHT> No </TD><TD><input type="checkbox"></TD></TR> 
 </TABLE>
 
 <HR TITLE="Information about this document">

data/good_pages/some_test_page.rb

@@ -101,7 +101,7 @@ PageObjectWrapper.define_page(:some_test_page) do
 
   table(:table_with_header) do
     locator :summary => 'Each row names a Nordic country and specifies its total area and land area, in square kilometers'
-    header [:country, :total_area, :land_area]
+    header [:country, :total_area, :land_area, :link, :checkbox]
   end
 
   validator(:textarea_value) do |expected|

data/lib/page_object_wrapper/PageObject.rb

@@ -464,13 +464,25 @@ module PageObjectWrapper
           t.rows.each{|r|
             if search_value.is_a? String
               begin 
-                found = r.cells[search_for_index] if r.cells[search_in_index].text == search_value
+                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
               end
             elsif search_value.is_a? Regexp
               begin
-                found = r.cells[search_for_index] if search_value.match(r.cells[search_in_index].text)
+                if search_value.match(r.cells[search_in_index].text)
+                  found = r.cells[search_for_index] 
+                  break
+                end
               rescue Watir::Exception::UnknownObjectException
                 found = nil
               end
@@ -526,7 +538,15 @@ module PageObjectWrapper
           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)
-            conditions_met = false if r[column_index].text != query[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
+            end
+            conditions_met = false if column_text != query[column_name]
           }
         end
         if conditions_met

data/lib/version.rb

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

data/spec/select_from_xxx_spec.rb

@@ -39,8 +39,8 @@ describe "page_object.select_from_xxx" do
       it "raises ArgumentError if second_arg's key is :row and second_arg's value not Integer" do
         expect{ tp.select_from_table_without_header(:column_1, { :row => "a string" }) }.to raise_error ArgumentError, "\"a string\" not Integer"
       end
-      it "raises Watir::Exception::UnknownObjectException if requested for non existing column" do
-        expect{ tp.select_from_table_without_header(:column_3).text }.to raise_error(Watir::Exception::UnknownObjectException)
+      it "raises Watir::Exception::UnknownObjectException if column inside header but not present in table" do
+        expect{ tp.select_from_table_without_header(:column_99).text }.to raise_error(Watir::Exception::UnknownObjectException)
       end
       
       context "next_page specified" do
@@ -57,14 +57,14 @@ describe "page_object.select_from_xxx" do
 
     context "where == nil" do
       context "next_page not specified" do
-        it "returns last row value from provided column" 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'
         end
       end
       context "next_page specified" do
-        it "returns last row value from provided column" do
+        it "returns middle row value from provided column" do
           tp.select_from_table_without_header(:column_0, nil, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
         end
       end
@@ -76,6 +76,8 @@ describe "page_object.select_from_xxx" 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_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
           it "returns nil" do
             tp.select_from_table_without_header(:column_0, :column_1 => '123').should eq nil
@@ -86,6 +88,8 @@ describe "page_object.select_from_xxx" do
           it "returns found cells" do
             tp.select_from_table_without_header(:column_0, :column_1 => /103/).text.should eq 'Iceland'
             tp.select_from_table_with_header(:country, :total_area => /337/).text.should eq 'Finland'
+            tp.select_from_table_with_header(:country, :checkbox => 'fal').should eq nil
+            tp.select_from_table_with_header(:country, :checkbox => 'tr').should eq nil
           end
           it "returns nil" do
             tp.select_from_table_without_header(:column_0, :column_1 => /123/).should eq nil

data/spec/{select_raw_from_xxx_spec.rb → select_row_from_xxx_spec.rb}

@@ -51,6 +51,12 @@ describe "page_object.select_from_xxx" do
         t_row = tp.select_row_from_table_with_header(:number => 1, :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')
+        t_row.should be_a Hash
+        t_row[:country].text.should eq 'Denmark'
+        t_row = tp.select_row_from_table_with_header(:checkbox => 'true')
+        t_row.should be_a Hash
+        t_row[:country].text.should eq 'Norway'
       end
     end
 
@@ -62,6 +68,9 @@ describe "page_object.select_from_xxx" do
         t_row = tp.select_row_from_table_without_header(:column_0 => 'Denmark')
         t_row.should be_a Hash
         t_row[:column_0].text.should eq 'Denmark'
+        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.should be_a Hash
         t_row[:column_0].text.should eq 'Denmark'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &11013380 !ruby/object:Gem::Requirement
+  requirement: &13697700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11013380
+  version_requirements: *13697700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11048940 !ruby/object:Gem::Requirement
+  requirement: &13696620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11048940
+  version_requirements: *13696620
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &11047780 !ruby/object:Gem::Requirement
+  requirement: &13695100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11047780
+  version_requirements: *13695100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11066000 !ruby/object:Gem::Requirement
+  requirement: &13694220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *11066000
+  version_requirements: *13694220
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &11063740 !ruby/object:Gem::Requirement
+  requirement: &13709660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11063740
+  version_requirements: *13709660
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email:
@@ -117,7 +117,7 @@ files:
 - spec/press_xxx_spec.rb
 - spec/required_elements_spec.rb
 - spec/select_from_xxx_spec.rb
-- spec/select_raw_from_xxx_spec.rb
+- spec/select_row_from_xxx_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/xxx_each.rb
@@ -159,7 +159,7 @@ test_files:
 - spec/press_xxx_spec.rb
 - spec/required_elements_spec.rb
 - spec/select_from_xxx_spec.rb
-- spec/select_raw_from_xxx_spec.rb
+- spec/select_row_from_xxx_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/xxx_each.rb