page_object_wrapper 1.5.7 → 1.5.8

data/good_pages/some_test_page.rb

@@ -57,7 +57,7 @@ PageObjectWrapper.define_page(:some_test_page) do
     checkbox(:cb1){ 
       locator :id => 'f5'
       menu :loud, true 
-      menu :quite, false
+      menu :quite, "false"
     }
 
     checkbox(:cb2){ 

data/lib/page_object_wrapper/PageObject.rb

@@ -384,14 +384,15 @@ module PageObjectWrapper
         watir_elements << watir_element
         case watir_element
           when Watir::CheckBox
-            watir_element.when_present.set eval(food) if ["true", "false"].include? food
+            food = eval food if ['true', 'false'].include? food
+            watir_element.when_present.set food if [true, false].include? food
           when Watir::Radio
-            watir_element.when_present.set if food=="true"          
+            watir_element.when_present.set if ['true', true].include? food
           when Watir::Select
             watir_element.select food if watir_element.include? food
           else
             if watir_element.respond_to?(:set)
-              watir_element.when_present.set food if food!=''
+              watir_element.when_present.set food if food != ''
             else
               # this is an element which does not support input (e.g. button) => skipping it
               next
@@ -406,11 +407,12 @@ module PageObjectWrapper
       watir_element = PageObject.return_watir_element e
       case watir_element
       when Watir::CheckBox
-          watir_element.when_present.set value if [true, false].include? value
+        value = eval value if ['true', 'false'].include? value
+        watir_element.when_present.set value if [true, false].include? value
       when Watir::Radio
-          watir_element.when_present.set if value==true          
+        watir_element.when_present.set if ['true', true].include? value
       when Watir::Select
-          watir_element.select value if watir_element.include? value
+        watir_element.select value if watir_element.include? value
       else
         if watir_element.respond_to?(:set)
           watir_element.when_present.set value 
@@ -524,8 +526,6 @@ module PageObjectWrapper
       conditions = query.clone
       conditions.delete(:number)
       raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
-      PageObjectWrapper.browser.table(table.locator_value).wait_until_present
-      t = PageObjectWrapper.browser.table(table.locator_value)
       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,15 +535,13 @@ 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
+
+      PageObjectWrapper.browser.table(table.locator_value).wait_until_present
+      t = PageObjectWrapper.browser.table(table.locator_value)
       
       if query.has_key? :number
-        candidate_rows = [t[query[:number]]]
+        r = 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|
@@ -575,7 +573,42 @@ module PageObjectWrapper
           }
           return found_row
         end
-      }
+      else
+        t.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
+                break
+              end
+              conditions_met = false if 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.5.7" unless const_defined?(:VERSION)
+  VERSION = "1.5.8" unless const_defined?(:VERSION)
 end

data/spec/feed_xxx_spec.rb

@@ -60,11 +60,19 @@ describe "page_object.feed_xxx" do
       it "FEEDS checkbox with true value" do
         @tp.feed_cb1(true)
         @b.checkbox(:id => 'f5').should be_set
+        @tp.feed_cb1(false)
+        @b.checkbox(:id => 'f5').should_not be_set
+        @tp.feed_cb1("true")
+        @b.checkbox(:id => 'f5').should be_set
+        @tp.feed_cb1("false")
+        @b.checkbox(:id => 'f5').should_not be_set
       end    
 
       it "FEEDS radio with true" do
         @tp.feed_rb1(true)
         @b.radio(:id => 'f3').should be_set
+        @tp.feed_rb1("true")
+        @b.radio(:id => 'f3').should be_set
       end    
 
       it "FEEDS select list if provided value exists in it" do

data/spec/spec_helper.rb

@@ -5,10 +5,10 @@ RSpec.configure do |config|
   $headless = Headless.new
   config.before(:suite){
     PageObjectWrapper.load('./good_pages')
-    $headless.start
+    #$headless.start
   }
 
   config.after( :suite ){
-    $headless.destroy
+    #$headless.destroy
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &24301940 !ruby/object:Gem::Requirement
+  requirement: &8142420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24301940
+  version_requirements: *8142420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &24301200 !ruby/object:Gem::Requirement
+  requirement: &8141680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24301200
+  version_requirements: *8141680
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &24300340 !ruby/object:Gem::Requirement
+  requirement: &8140840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24300340
+  version_requirements: *8140840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24299460 !ruby/object:Gem::Requirement
+  requirement: &8139880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *24299460
+  version_requirements: *8139880
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &24298860 !ruby/object:Gem::Requirement
+  requirement: &8139060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24298860
+  version_requirements: *8139060
 - !ruby/object:Gem::Dependency
   name: headless
-  requirement: &24298240 !ruby/object:Gem::Requirement
+  requirement: &8138320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24298240
+  version_requirements: *8138320
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email: