page_object_wrapper 1.3.2 → 1.3.3

data/README.md

@@ -49,8 +49,7 @@ where required attributes are marked with (*)
         elements_set(:test_elements) do
           text_field(:tf) do
             locator :id => 'f1'
-            missing_food 'some missing food'
-            fresh_food 'some fresh food'
+            menu :user_defined, 'some food'
           end
 
           textarea(:ta) do
@@ -59,13 +58,13 @@ where required attributes are marked with (*)
           
           select(:s1) do
             locator :id => 'f10'
-            fresh_food 'one'
-            missing_food 'three'
+            menu :fresh_food, 'one'
+            menu :missing_food, 'three'
           end
 
           select(:s2) do
-            locator :id => 'f11'
-            fresh_food 'one'
+            locator "form(:action => 'http://www.cs.tut.fi/cgi-bin/run/~jkorpela/echo.cgi').select(:id => 'f11')"
+            menu :fresh_food, 'one'
           end
 
           checkbox(:cb){ locator :id => 'f5' }
@@ -152,6 +151,7 @@ Defined elements can be accessed with their labels.
       tp.tf # => Watir::TextField
       tp.rb # => Watir::Radio
       tp.test_elements # => Array of Watir elements
+      tp.table_with_header # => Watir::Table
 
 
 
@@ -179,17 +179,17 @@ current\_page
         tp = PageObjectWrapper.open_page(:some_test_page)
         tp.feed_test_elements(:missing_food)
 
-#### xxx\_fresh\_food, xxx\_missing\_food  
+#### xxx\_menu  
 *parameters*  
-no  
+:food\_type
 *returns*  
-fresh or missinf food value from page definition  
+food value for this type which is defined in page\_object  
   
 *preconditions*  
 **tp** is a :some\_test\_page object opened in the browser  
 
-    tp.tf_fresh_food # => 'some fresh food' 
-    tp.ta_fresh_food # => 'default fresh food'
+    tp.tf_menu(:fresh_food) # => 'default fresh food' 
+    tp.tf_menu(:user_defined) # => 'some food'
 
 #### fire\_xxx 
 *parameters*  

data/bad_pages/bad_page.rb

@@ -9,9 +9,11 @@ PageObjectWrapper.define_page('some_page_with_lost_of_errors') do
 
   elements_set(:bad_elements) do
     element('') do
+      menu :fresh_food, Array.new
     end
     element(:e) do
       locator ':e element locator'
+      menu 'a string', 'another string'
     end
     element(:e) do
       locator Hash.new

data/good_pages/another_test_page.rb

@@ -5,8 +5,8 @@ PageObjectWrapper.define_page(:another_test_page) do
   elements_set(:test_elements) do
     select(:s1) do
       locator :id => 'f10'
-      fresh_food 'not in select list'
-      missing_food 'not in select list'
+      menu :fresh_food, 'not in select list'
+      menu :missing_food, 'not in select list'
     end
   end
 end

data/good_pages/some_test_page.rb

@@ -5,8 +5,7 @@ PageObjectWrapper.define_page(:some_test_page) do
   elements_set(:test_elements) do
     text_field(:tf) do
       locator :id => 'f1'
-      missing_food 'some missing food'
-      fresh_food 'some fresh food'
+      menu :user_defined, 'some food'
     end
 
     textarea(:ta) do
@@ -15,13 +14,13 @@ PageObjectWrapper.define_page(:some_test_page) do
     
     select(:s1) do
       locator :id => 'f10'
-      fresh_food 'one'
-      missing_food 'three'
+      menu :fresh_food, 'one'
+      menu :missing_food, 'three'
     end
 
     select(:s2) do
-      locator :id => 'f11'
-      fresh_food 'one'
+      locator "form(:action => 'http://www.cs.tut.fi/cgi-bin/run/~jkorpela/echo.cgi').select(:id => 'f11')"
+      menu :fresh_food, 'one'
     end
 
     checkbox(:cb){ locator :id => 'f5' }

data/lib/page_object_wrapper/Element.rb

@@ -1,15 +1,18 @@
 require 'Dsl'
 class Element < DslElementWithLocator
   attr_reader :type
-  dsl_attr_accessor :fresh_food, :missing_food
-
-  DEFAULT_FRESH_FOOD = 'default fresh food'
-  DEFAULT_MISSING_FOOD = 'default missing food'
 
   def initialize(label, type)
     super label
     @type = type
-    @fresh_food = DEFAULT_FRESH_FOOD
-    @missing_food = DEFAULT_MISSING_FOOD
+    @menu = { :fresh_food => 'default fresh food', :missing_food => 'default missing food' }
+  end
+
+  def menu food_type, value
+    @menu[food_type] = value
+  end
+
+  def menu_value
+    @menu
   end
 end

data/lib/page_object_wrapper/Exceptions.rb

@@ -1,5 +1,5 @@
 module PageObjectWrapper
-  class UnknownFoodType < StandardError;  end
+  class UnknownMenuType < StandardError;  end
   class UnableToFeedObject < StandardError; end
   class UnknownPageObject < StandardError; end
   class UnmappedPageObject < StandardError; end

data/lib/page_object_wrapper/PageObject.rb

@@ -19,7 +19,6 @@ class PageObject < DslElementWithLocator
   @@current_page = nil
 
   UNIQ_ELEMENT_WAIT_PERIOD = 10
-  FOOD_TYPES = [:missing_food, :fresh_food]
   FEED_ALL = Regexp.new(/^feed_all$/)
   FEED_SET = Regexp.new(/^feed_([\w_]+)$/)
   FIRE_ACTION = Regexp.new(/^fire_([\w_]+)$/)
@@ -188,11 +187,8 @@ class PageObject < DslElementWithLocator
     eset.instance_eval(&block)
     @esets << eset
     eset.elements.each{|e|
-      PageObject.send :define_method, (e.label_value.to_s+'_fresh_food').to_sym do
-        e.fresh_food_value
-      end
-      PageObject.send :define_method, (e.label_value.to_s+'_missing_food').to_sym do
-        e.missing_food_value
+      PageObject.send :define_method, (e.label_value.to_s+'_menu').to_sym do |food_type|
+        e.menu_value[food_type].to_s
       end
     }
     @elements += eset.elements
@@ -250,7 +246,8 @@ class PageObject < DslElementWithLocator
         element_output = []
         element_output << "\t\telement #{e.label_value.inspect} already defined\n" if labeled(eset.elements).count(e.label_value) > 1
         element_output << "\t\tlabel #{e.label_value.inspect} not a Symbol\n" if not e.label_value.is_a?(Symbol)
-        element_output << "\t\tlocator #{e.locator_value.inspect} not a meaningful Hash\n" if not e.locator_value.is_a?(Hash) or e.locator_value.empty?
+        element_output << "\t\tlocator #{e.locator_value.inspect} not a meaningful Hash or String\n" if (not e.locator_value.is_a?(Hash) and not e.locator_value.is_a?(String)) or e.locator_value.empty?
+        element_output << "\t\tmenu #{e.menu_value.inspect} not properly defined (must be {:food_type => 'a string'})\n" if (e.menu_value.keys.collect(&:class).uniq! != [Symbol]) or (e.menu_value.values.collect(&:class).uniq! != [String])
         element_output.unshift "\telement(#{e.label_value.inspect}):\n" if not element_output.empty?
         output += element_output       
       }
@@ -311,20 +308,28 @@ private
   end
   
   def return_watir_element(e)
-    @@browser.send e.type, e.locator_value
+    el = nil
+    if e.locator_value.is_a? Hash
+      el = @@browser.send e.type, e.locator_value
+    elsif e.locator_value.is_a? String
+      el = @@browser.instance_eval e.locator_value
+    end
+    el
   end
 
   def return_array_of_watir_elements(eset)
-    eset.elements.collect{|e| @@browser.send(e.type, e.locator_value)}
+    eset.elements.collect{|e| return_watir_element(e)}
   end
 
-  def feed_elements(elements, food_type=nil)
+  def feed_elements(elements, menu_type=nil)
     raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
-    food_type ||= :fresh_food
-    raise PageObjectWrapper::UnknownFoodType, food_type.inspect if not FOOD_TYPES.include?(food_type)
+    menu_type ||= :fresh_food
+    known_types = []
+    elements.each{ |e| known_types += e.menu_value.keys }
+    raise PageObjectWrapper::UnknownMenuType, menu_type.inspect if not known_types.include?(menu_type)
     elements.each{|e|
-      food = e.send (food_type.to_s+'_value').to_sym
-      watir_element = @@browser.send e.type, e.locator_value
+      food = e.menu_value[menu_type].to_s
+      watir_element = return_watir_element(e)
       case watir_element
         when Watir::CheckBox
           watir_element.when_present.set
@@ -334,12 +339,8 @@ private
           begin
             watir_element.when_present.select food
           rescue Watir::Exception::NoValueFoundException => e
-            if food_type == :missing_food
-              # proceed to next element if missing_food is not found in select list
-              next
-            else
-              raise e
-            end
+            # proceed to next element if missing_food is not found in select list
+            next
           end
         else
           if watir_element.respond_to?(:set)

data/lib/page_object_wrapper/version.rb

@@ -1,3 +1,3 @@
 module PageObjectWrapper
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spec/define_page_object_spec.rb

@@ -31,6 +31,8 @@ describe "define_page_object" do
 
     specify { subject.elements.collect(&:label_value).should include(:tf)}
     it { should respond_to(:tf) }
+    it { should respond_to(:tf_menu) }
+    it { should respond_to(:ta_menu) }
 
     specify { subject.actions.collect(&:label_value).should include(:press_cool_button)}
     it { should respond_to(:fire_press_cool_button) }
@@ -72,21 +74,22 @@ describe "define_page_object" do
       its(:locator_value) { should be_a Hash }
     end
 
-    describe "element food" do
-      it { should respond_to(:fresh_food) }
-      it { should respond_to(:fresh_food_value) }
-      it { should respond_to(:missing_food) }
-      it { should respond_to(:missing_food_value) }
+    describe "element menu" do
+      it { should respond_to(:menu) }
+      it { should respond_to(:menu_value) }
 
-      its(:fresh_food_value) { should be_a String}
-      its(:missing_food_value) { should be_a String}
+      its(:menu_value) { should be_a Hash}
 
-      describe "food default values" do
-        its(:fresh_food_value){ should eq('some fresh food') }
+      describe "default menu" do
+        its(:menu_value){ should have_key(:fresh_food) }        
+        its(:menu_value){ should have_value 'default fresh food'}
+        its(:menu_value){ should have_key(:missing_food) }
+        its(:menu_value){ should have_value 'default missing food'}
       end
 
-      describe "food user defined values" do
-        its(:missing_food_value){ should eq('some missing food') }
+      describe "user defined menu" do
+        its(:menu_value){ should have_key :user_defined }
+        its(:menu_value){ should have_value 'some food'}
       end
     end
   end

data/spec/{feed_elements_spec.rb → feed_xxx_spec.rb}

@@ -32,7 +32,7 @@ describe "page_object.feed_xxx" do
       it "populates all xxx elements with :fresh_food" do
         tp = PageObjectWrapper.current_page
         tp.feed_test_elements(:fresh_food)
-        @b.text_field(:id=>'f1').value.should eq 'some fresh food'
+        @b.text_field(:id=>'f1').value.should eq 'default fresh food'
         @b.textarea(:id=>'f2').value.should eq 'default fresh food'
         @b.select(:id=>'f10').value.should eq "one"
         @b.select(:id=>'f11').value.should eq "one"
@@ -41,11 +41,24 @@ describe "page_object.feed_xxx" do
       end
     end
 
+    context "argument = :user_defined" do
+      it "populates all xxx elements with :user_defined" do
+        tp = PageObjectWrapper.open_page(:some_test_page)
+        tp.feed_test_elements(:user_defined)
+        @b.text_field(:id=>'f1').value.should eq 'some food'
+        @b.textarea(:id=>'f2').value.should eq ''
+        @b.select(:id=>'f10').value.should eq "two (default)"
+        @b.select(:id=>'f11').value.should eq "two (default)"
+        @b.checkbox(:id=>'f5').should be_set
+        @b.radio(:id=>'f3').should be_set
+      end
+    end
+
     context "argument = nil" do
       it "populates all xxx elements with :fresh_food" do
         tp = PageObjectWrapper.current_page
         tp.feed_test_elements
-        @b.text_field(:id=>'f1').value.should eq 'some fresh food'
+        @b.text_field(:id=>'f1').value.should eq 'default fresh food'
         @b.textarea(:id=>'f2').value.should eq 'default fresh food'
         @b.select(:id=>'f10').value.should eq "one"
         @b.select(:id=>'f11').value.should eq "one"
@@ -58,7 +71,7 @@ describe "page_object.feed_xxx" do
       it "populates all xxx elements with :missing_food" do
         tp = PageObjectWrapper.open_page(:some_test_page)
         tp.feed_test_elements(:missing_food)
-        @b.text_field(:id=>'f1').value.should eq 'some missing food'
+        @b.text_field(:id=>'f1').value.should eq 'default missing food'
         @b.textarea(:id=>'f2').value.should eq 'default missing food'
         @b.select(:id=>'f10').value.should eq "three"
         @b.select(:id=>'f11').value.should eq "two (default)"
@@ -67,13 +80,7 @@ describe "page_object.feed_xxx" do
       end
     end
 
-    context "fresh food is not found in select list" do
-      it "raises Watir Watir::Exception::NoValueFoundException" do
-        atp = PageObjectWrapper.open_page(:another_test_page)
-        expect{atp.feed_test_elements}.to raise_error(Watir::Exception::NoValueFoundException)
-      end
-    end
-    context "missing food is not found in select list" do
+    context "food not found in select list" do
       it "continues execution" do
         atp = PageObjectWrapper.current_page
         atp.feed_test_elements(:missing_food).should eq(atp)

data/spec/load_spec.rb

@@ -10,7 +10,9 @@ describe "PageObjectWrapper.load" do
       begin
         PageObjectWrapper.load(File.dirname(__FILE__)+'/../bad_pages')
       rescue Exception => e
+        #puts '=============='
         #puts e.message
+        #puts '=============='
         e.should be_a(PageObjectWrapper::Load)
         e.message.should == 'page_object("some_page_with_lost_of_errors"):
 	label "some_page_with_lost_of_errors" not a Symbol
@@ -19,13 +21,14 @@ elements_set("some elements_set label"):
 	label "some elements_set label" not a Symbol
 	element(""):
 		label "" not a Symbol
-		locator nil not a meaningful Hash
+		locator nil not a meaningful Hash or String
+		menu {:fresh_food=>[], :missing_food=>"default missing food"} not properly defined (must be {:food_type => \'a string\'})
 	element(:e):
 		element :e already defined
-		locator ":e element locator" not a meaningful Hash
+		menu {:fresh_food=>"default fresh food", :missing_food=>"default missing food", "a string"=>"another string"} not properly defined (must be {:food_type => \'a string\'})
 	element(:e):
 		element :e already defined
-		locator {} not a meaningful Hash
+		locator {} not a meaningful Hash or String
 action(""):
 	label "" not a Symbol
 	next_page nil not a Symbol

data/spec/menu_xxx_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+describe "getting food specified for element" do
+  subject{ PageObjectWrapper.receive_page(:some_test_page) }
+
+  describe "page_object.xxx_menu(:food_type)" do
+    it "raises NoMethodError if xxx is not known element" do
+      expect{ subject.unknown_menu }.to raise_error(NoMethodError)  
+    end      
+
+    it{ should respond_to(:tf_menu) }
+
+    it "tf_menu(:fresh_food)" do
+      subject.tf_menu(:fresh_food).should eq 'default fresh food'
+    end
+    it "tf_menu(:missing_food)" do
+      subject.tf_menu(:missing_food).should eq 'default missing food'
+    end
+    it "tf_menu(:user_defined)" do
+      subject.tf_menu(:user_defined).should eq 'some food'
+    end
+    it "tf_menu(:unknown_food)" do
+      subject.tf_menu(:unknown_food).should eq ''
+    end
+    it "tf_menu('unknown_food')" do
+      subject.tf_menu(:unknown_food).should eq ''
+    end
+
+  end
+end

data/spec/{select_from_spec.rb → select_from_xxx_spec.rb}

@@ -56,8 +56,8 @@ describe "page_object.select_from_xxx" do
       context "next_page not specified" do
         it "returns last 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 '449,964'
-          tp.select_from_table_without_header(:column_2).text.should eq '410,928'
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &17123400 !ruby/object:Gem::Requirement
+  requirement: &7037740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17123400
+  version_requirements: *7037740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17125340 !ruby/object:Gem::Requirement
+  requirement: &6983320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17125340
+  version_requirements: *6983320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17127900 !ruby/object:Gem::Requirement
+  requirement: &6929080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *17127900
+  version_requirements: *6929080
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &17032940 !ruby/object:Gem::Requirement
+  requirement: &6900840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17032940
+  version_requirements: *6900840
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email:
@@ -93,17 +93,18 @@ files:
 - page_object_wrapper.gemspec
 - page_object_wrapper.gemspec.orig
 - spec/define_page_object_spec.rb
-- spec/defined_elements_spec.rb
-- spec/each_page.rb
-- spec/feed_elements_spec.rb
-- spec/fire_event_and_validate_spec.rb
+- spec/each_xxx.rb
+- spec/feed_xxx_spec.rb
+- spec/fire_xxx_and_validate_xxx_spec.rb
 - spec/generate_spec.rb
-- spec/get_food_spec.rb
 - spec/load_spec.rb
-- spec/open_spec.rb
-- spec/select_from_spec.rb
+- spec/menu_xxx_spec.rb
+- spec/open_page_spec.rb
+- spec/open_xxx.rb
+- spec/select_from_xxx_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
+- spec/xxx_spec.rb
 homepage: https://github.com/evgeniy-khatko/page_object_wrapper
 licenses: []
 post_install_message: 
@@ -131,14 +132,15 @@ specification_version: 3
 summary: Wraps watir-webdriver with convenient testing interface.
 test_files:
 - spec/define_page_object_spec.rb
-- spec/defined_elements_spec.rb
-- spec/each_page.rb
-- spec/feed_elements_spec.rb
-- spec/fire_event_and_validate_spec.rb
+- spec/each_xxx.rb
+- spec/feed_xxx_spec.rb
+- spec/fire_xxx_and_validate_xxx_spec.rb
 - spec/generate_spec.rb
-- spec/get_food_spec.rb
 - spec/load_spec.rb
-- spec/open_spec.rb
-- spec/select_from_spec.rb
+- spec/menu_xxx_spec.rb
+- spec/open_page_spec.rb
+- spec/open_xxx.rb
+- spec/select_from_xxx_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
+- spec/xxx_spec.rb

data/spec/get_food_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-describe "getting food specified for element" do
-  subject{ PageObjectWrapper.receive_page(:some_test_page) }
-
-  describe "page_object.xxx_fresh_food" do
-    it "raises NoMethodError if xxx is not known element" do
-      expect{ subject.unknown_fresh_food }.to raise_error(NoMethodError)  
-    end      
-
-    it{ should respond_to(:tf_fresh_food) }
-    its(:tf_fresh_food){ should eq 'some fresh food' }
-
-    it{ should respond_to(:ta_fresh_food) }
-    its(:ta_fresh_food){ should eq 'default fresh food' }
-  end
-
-  describe "page_object.xxx_missing_food" do
-    it "raises NoMethodError if xxx is not known element" do
-      expect{ subject.unknown_fresh_food }.to raise_error(NoMethodError)  
-    end      
-
-    it{ should respond_to(:tf_fresh_food) }
-    its(:tf_missing_food){ should eq 'some missing food' }
-
-    it{ should respond_to(:ta_fresh_food) }
-    its(:ta_missing_food){ should eq 'default missing food' }
-  end
-end