page_object_wrapper 1.4.9 → 1.5.0

data/lib/page_object_wrapper.rb

@@ -6,18 +6,21 @@ require pwd + 'page_object_wrapper/PageObject'
 module PageObjectWrapper
   @@domain = nil
   @@browser = nil
-  @@language = :english
+  @@current_page = nil
+  @@current_action_result = nil
+  @@current_table_row = nil
+  @@current_table_cell = nil
 
   def self.domain=val
     @@domain=val
   end
 
   def self.use_browser b
-    PageObject.browser = b
+    @@browser = b
   end
 
   def self.browser
-    PageObject.browser
+    @@browser
   end
 
   def self.define_page(label, &block)
@@ -28,11 +31,40 @@ module PageObjectWrapper
   end
 
   def self.current_page
-    PageObject.current_page
+    @@current_page
+  end
+
+  def self.current_page= page_object
+    @@current_page = page_object
+  end
+
+  def self.current_action_result= res
+    @@current_action_result = res
+  end
+
+  def self.current_action_result
+    @@current_action_result
+  end
+
+  def self.current_table_row= res
+    @@current_table_row = res
+  end
+
+  def self.current_table_row
+    @@current_table_row
+  end
+
+  def self.current_table_cell= res
+    @@current_table_cell = res
+  end
+
+  def self.current_table_cell
+    @@current_table_cell
   end
 
   def self.current_page? label
-    PageObject.current_page? label
+    PageObject.map_current_page label
+    true
   end
 
   def self.load(path_to_pages='.')

data/lib/page_object_wrapper/PageObject.rb

@@ -15,9 +15,7 @@ require pwd + '/known_elements'
 module PageObjectWrapper
   class PageObject < DslElementWithLocator
     attr_reader :esets, :elements, :actions, :aliases, :validators, :tables, :paginations, :uniq_element_type, :uniq_element_hash
-    @@browser = nil
     @@pages = []
-    @@current_page = nil
 
     REQUIRED_ELEMENT_WAIT_PERIOD = 10
     FEED_ALL = Regexp.new(/^feed_all$/)
@@ -61,58 +59,58 @@ module PageObjectWrapper
         when has_eset?(method_name)
           # page_object.some_elements_set
           eset = eset_for(method_name)
-          PageObject.return_array_of_watir_elements(eset)
+          PageObjectWrapper.current_action_result = PageObject.return_array_of_watir_elements(eset)
         when has_element?(method_name)
           # page_object.some_element
           element = element_for(method_name)
-          PageObject.return_watir_element element
+          PageObjectWrapper.current_action_result = PageObject.return_watir_element element
         when FEED_ALL.match(method_name)
           # page_object.feed_all(:fresh_food)
-          feed_elements(@elements, *args)
+          PageObjectWrapper.current_action_result = feed_elements(@elements, *args)
         when (FEED.match(method_name) and has_eset?($1))
           # page_object.feed_some_elements_set(:fresh_food)
           eset = eset_for($1)
-          feed_elements(eset.elements, *args)
+          PageObjectWrapper.current_action_result = feed_elements(eset.elements, *args)
         when (FEED.match(method_name) and has_element?($1))
           # page_object.feed_some_element(:fresh_food)
           e = element_for($1)
           if [true, false].include? args[0] or args[0].is_a? String 
-            feed_field(e, args[0])
+            PageObjectWrapper.current_action_result = feed_field(e, args[0])
           else
-            feed_elements([e], *args)
+            PageObjectWrapper.current_action_result = feed_elements([e], *args)
           end
         when (FIRE_ACTION.match(method_name) and has_action?($1))
           # page_object.fire_some_action
           a = action_for($1)
-          fire_action(a, *args)
+          PageObjectWrapper.current_action_result = fire_action(a, *args)
         when (FIRE_ACTION.match(method_name) and has_alias?($1))
           # page_object.fire_some_action
           a = alias_for($1)
-          fire_action(a, *args)
+          PageObjectWrapper.current_action_result = fire_action(a, *args)
         when (VALIDATE.match(method_name) and has_validator?($1))
           # page_object.validate_something
           v = validator_for($1)
-          run_validator(v, *args)
+          PageObjectWrapper.current_action_result = run_validator(v, *args)
         when (SELECT_FROM.match(method_name) and has_table?($1))
           # page_object.select_from_some_table(:header_column, {:column => 'value'})
           table = table_for($1)
-          select_from(table, *args)
+          PageObjectWrapper.current_table_cell = select_from(table, *args)
         when (SELECT_ROW_FROM.match(method_name) and has_table?($1))
           # page_object.select_row_from_some_table(:number => 1, :column1 => value1, :column2 => value3, ...)
           table = table_for($1)
-          select_row_from(table, args[0])
+          PageObjectWrapper.current_table_row = select_row_from(table, args[0])
         when (PAGINATION_EACH.match(method_name) and has_pagination?($1))
           # page_object.each_pagination
           pagination = pagination_for($1)
-          run_each_subpage(pagination, *args, &block)
+          PageObjectWrapper.current_action_result = run_each_subpage(pagination, *args, &block)
         when (PAGINATION_OPEN.match(method_name) and has_pagination?($1))
           # page_object.open_padination(1)
           pagination = pagination_for($1)
-          open_subpage(pagination, *args)
+          PageObjectWrapper.current_action_result = open_subpage(pagination, *args)
         when (PRESS.match(method_name) and has_element?($1))
           # page_object.press_element
           element = element_for($1)
-          press(element)
+          PageObjectWrapper.current_action_result = press(element)
         else
           super
       end
@@ -170,7 +168,7 @@ module PageObjectWrapper
     end
 
     def self.open_page label, optional_hash=nil
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil?
       raise PageObjectWrapper::UnknownPageObject, label.inspect if not @@pages.collect(&:label_value).include?(label)
       page_object = PageObject.find_page_object(label)
       url = ''
@@ -184,11 +182,11 @@ module PageObjectWrapper
           url.gsub!(/:#{k.to_s}/, v)
         }
       end
-      @@browser.goto url
+      PageObjectWrapper.browser.goto url
     end
 
     def self.map_current_page label
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil?
       raise PageObjectWrapper::UnknownPageObject, label.inspect if not @@pages.collect(&:label_value).include?(label)
       page_object = PageObject.find_page_object(label)
       page_object.elements.select{ |e| e.required_value == true }.each{ |required_element|
@@ -196,33 +194,16 @@ module PageObjectWrapper
           watir_element = return_watir_element required_element
           watir_element.wait_until_present REQUIRED_ELEMENT_WAIT_PERIOD
         rescue Watir::Wait::TimeoutError => e
-          raise PageObjectWrapper::UnmappedPageObject, "#{label} <=> #{@@browser.url} (#{e.message})" if not watir_element.present?
+          raise PageObjectWrapper::UnmappedPageObject, "#{label} <=> #{PageObjectWrapper.browser.url} (#{e.message})" if not watir_element.present?
         end
       }
-      @@current_page = page_object
-    end
-
-    def self.current_page? label
-      self.map_current_page label
-      true
-    end
-
-    def self.current_page
-      @@current_page
+      PageObjectWrapper.current_page = page_object
     end
 
     def self.pages
       @@pages
     end
 
-    def self.browser=(val)
-      @@browser = val
-    end
-
-    def self.browser
-      @@browser
-    end
-
     def elements_set(label, &block)
       eset = ElementsSet.new(label)
       eset.instance_eval(&block)
@@ -359,9 +340,9 @@ module PageObjectWrapper
     def self.return_watir_element(e)
       el = nil
       if e.locator_value.is_a? Hash
-        el = @@browser.send e.type, e.locator_value
+        el = PageObjectWrapper.browser.send e.type, e.locator_value
       elsif e.locator_value.is_a? String
-        el = @@browser.instance_eval e.locator_value
+        el = PageObjectWrapper.browser.instance_eval e.locator_value
       end
       el
     end
@@ -371,8 +352,9 @@ module PageObjectWrapper
     end
 
     def feed_elements(elements, *args)
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
       menu_name, cheef_menu = nil, nil
+      watir_elements = []
       
       if args[0].is_a? Symbol
         menu_name = args[0]
@@ -392,6 +374,7 @@ module PageObjectWrapper
           food = e.menu_value[menu_name].to_s
         end
         watir_element = PageObject.return_watir_element e
+        watir_elements << watir_element
         case watir_element
           when Watir::CheckBox
             watir_element.when_present.set eval(food) if ["true", "false"].include? food
@@ -405,11 +388,11 @@ module PageObjectWrapper
             else
               # this is an element which does not support input (e.g. button) => skipping it
               next
-              #raise PageObjectWrapper::UnableToFeedObject, to_tree(@@current_page, e) + ' check element type'
+              #raise PageObjectWrapper::UnableToFeedObject, to_tree(PageObjectWrapper.current_page, e) + ' check element type'
             end
           end
       }
-      self
+      watir_elements
     end
 
     def feed_field(e, value)
@@ -426,31 +409,32 @@ module PageObjectWrapper
           watir_element.when_present.set value 
         end
       end
+      watir_element
     end
 
 
     def fire_action(a, *args)
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
       block = (a.is_a? Action)? a.fire_block_value : action_for(a.action_value).fire_block_value
-      block_result = @@browser.instance_exec *args, &block
+      block_result = PageObjectWrapper.browser.instance_exec *args, &block
       if not a.next_page_value.nil?
         self.class.map_current_page a.next_page_value
-        return @@current_page
+        return PageObjectWrapper.current_page
       else
         return block_result
       end 
     end
 
     def run_validator(v, *args)
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
-      @@browser.instance_exec *args, &v.validate_block_value
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
+      PageObjectWrapper.browser.instance_exec *args, &v.validate_block_value
     end
 
     def select_from(table, header, *args)
       where = args[0]
       next_page = args[1]
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
-      t = @@browser.table(table.locator_value)
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
+      t = PageObjectWrapper.browser.table(table.locator_value)
       raise ArgumentError, "#{header.inspect} not a Symbol" if not header.is_a? Symbol
       raise ArgumentError, "#{header.inspect} not in table header" if not table.header_value.include? header
       search_for_index = table.header_value.index(header)
@@ -471,7 +455,7 @@ module PageObjectWrapper
         if where.keys.first == :row # finding by row number
           raise ArgumentError, "#{where.values.first.inspect} not Integer" if not ( where.values.first.is_a? Integer)
           begin 
-            found = t.rows[search_value+1].cells[search_for_index] # +1 because we want rows to start from 0 (similar to columns)
+            found = t.rows[search_value].cells[search_for_index] # +1 because we want rows to start from 0 (similar to columns)
           rescue Watir::Exception::UnknownObjectException
             found = nil
           end
@@ -517,8 +501,8 @@ module PageObjectWrapper
     def select_row_from(table, query)
       conditions = query.clone
       conditions.delete(:number)
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
-      t = @@browser.table(table.locator_value)
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
+      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?
@@ -558,12 +542,13 @@ module PageObjectWrapper
     end
 
     def run_each_subpage(p, opts=nil, &block)
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
       limit = opts[:limit] if not opts.nil?
       raise PageObjectWrapper::InvalidPagination, opts.inspect if limit < 0 if not limit.nil?
+      result = nil
 
-      @@browser.instance_eval "(#{p.locator_value}).wait_until_present"
-      current_link = @@browser.instance_eval p.locator_value
+      PageObjectWrapper.browser.instance_eval "(#{p.locator_value}).wait_until_present"
+      current_link = PageObjectWrapper.browser.instance_eval p.locator_value
       raise PageObjectWrapper::InvalidPagination, p.locator_value+'; '+p.finds_value if not current_link.present?
       current_page_number = p.finds_value.to_i
       counter = 0
@@ -573,31 +558,32 @@ module PageObjectWrapper
         current_link.when_present.click
         self.class.map_current_page self.label_value
         current_link.wait_while_present # waiting for the page to load by waiting current_link to become inactive
-        block.call self
+        result = block.call self
         current_page_number += 1
         current_link_locator = p.locator_value.gsub( p.finds_value.to_s, current_page_number.to_s )
-        current_link = @@browser.instance_eval current_link_locator
+        current_link = PageObjectWrapper.browser.instance_eval current_link_locator
         counter += 1
       end
+      result
     end
 
     def open_subpage p, n, *args
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
-      @@browser.instance_eval "(#{p.locator_value.to_s}).wait_until_present"
-      pagination_link = @@browser.instance_eval p.locator_value
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
+      PageObjectWrapper.browser.instance_eval "(#{p.locator_value.to_s}).wait_until_present"
+      pagination_link = PageObjectWrapper.browser.instance_eval p.locator_value
       raise PageObjectWrapper::InvalidPagination, p.locator_value+'; '+p.finds_value if not pagination_link.present?
       n_th_link_locator = p.locator_value.gsub( p.finds_value.to_s, n.to_s )
-      @@browser.instance_eval "(#{n_th_link_locator}).wait_until_present"
-      n_th_link = @@browser.instance_eval n_th_link_locator
+      PageObjectWrapper.browser.instance_eval "(#{n_th_link_locator}).wait_until_present"
+      n_th_link = PageObjectWrapper.browser.instance_eval n_th_link_locator
       n_th_link.click
       self.class.map_current_page self.label_value
       self
     end
 
     def press e
-      raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
+      raise PageObjectWrapper::BrowserNotFound if PageObjectWrapper.browser.nil? or not PageObjectWrapper.browser.exist?
       watir_element = PageObject.return_watir_element e
-      raise PageObjectWrapper::InvalidElement, "Element #{e.locator_value} not found in #{@@current_page}"\
+      raise PageObjectWrapper::InvalidElement, "Element #{e.locator_value} not found in #{PageObjectWrapper.current_page}"\
         if not watir_element.present?
       raise PageObjectWrapper::InvalidElement, "Element #{e.locator_value} does not respond to #{e.press_action_value}"\
         if not watir_element.respond_to? e.press_action_value

data/lib/version.rb

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

data/spec/currents_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "returned values" do
+  before(:all){ 
+    @b = Watir::Browser.new
+    PageObjectWrapper.use_browser @b 
+  }
+
+  after(:all){ PageObjectWrapper.browser.quit }
+  
+  it "returns corresponding values" do
+    tp = PageObjectWrapper.open_page :some_test_page
+    res = PageObjectWrapper.current_page
+    res.should be_a PageObjectWrapper::PageObject
+    res.label_value.should eq :some_test_page
+
+    tp.feed_tf 'text'
+    res = PageObjectWrapper.current_action_result
+    res.should be_a Watir::TextField
+    res.value.should eq 'text'
+
+    tp.feed_test_elements :loud
+    res = PageObjectWrapper.current_action_result
+    res.should be_a Array
+    res.collect(&:value).should eq ["bar", "tf food", "ta food", "1", "2", "on", "on", "one", "one"]
+
+    tp = tp.fire_press_cool_button
+    res = PageObjectWrapper.current_action_result
+    res.should be_a PageObjectWrapper::PageObject
+    res.label_value.should eq :test_page_with_table
+    
+    tp.select_from_test_table(:column_1, :row => 0)
+    res = PageObjectWrapper.current_table_cell
+    res.should be_a Watir::TableCell
+    res.text.should eq '42'
+
+    tp.select_row_from_test_table(:number => 0)
+    res = PageObjectWrapper.current_table_row
+    res.should be_a Hash
+    res[:column_1].text.should eq '42'
+  end
+end

data/spec/feed_xxx_spec.rb

@@ -24,9 +24,9 @@ describe "page_object.feed_xxx" do
     end
 
     it "returns current page object" do
-      @tp.feed_tf_standalone(:quite).should be_a PageObjectWrapper::PageObject
-      @tp.feed_test_elements(:quite).should be_a PageObjectWrapper::PageObject
-      @tp.feed_all(:quite).should be_a PageObjectWrapper::PageObject
+      @tp.feed_tf_standalone(:quite).should be_a Array
+      @tp.feed_test_elements(:quite).should be_a Array
+      @tp.feed_all(:quite).should be_a Array
     end
 
     describe "feed_standalone_element" do 

data/spec/open_page_spec.rb

@@ -50,14 +50,14 @@ describe "PageObjectWrapper.open_page" do
           begin
             PageObjectWrapper.open_page(:dynamic_url_page, :domain => 'google.com')
           rescue PageObjectWrapper::UnmappedPageObject
-            PageObjectWrapper::PageObject.browser.url.should =~ /google.\w+\/:path/
+            PageObjectWrapper.browser.url.should =~ /google.\w+\/:path/
           end
         end
       end
       context "all dynamic parameters specified" do
         it "opens page with all parameters replaced with specified" do
           PageObjectWrapper.open_page(:dynamic_url_page, :domain => 'google.com', :path => 'advanced_search')
-          PageObjectWrapper::PageObject.browser.url.should =~ /google.\w+\/advanced_search/
+          PageObjectWrapper.browser.url.should =~ /google.\w+\/advanced_search/
         end
       end
     end

data/spec/select_from_xxx_spec.rb

@@ -94,8 +94,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 'Iceland'
-            tp.select_from_table_with_header(:country, :row => 3).text.should eq 'Norway'
+            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'
           end
           it "returns nil" do
             tp.select_from_table_with_header(:country, :row => 123).should eq nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &13065260 !ruby/object:Gem::Requirement
+  requirement: &8756800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13065260
+  version_requirements: *8756800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &13100340 !ruby/object:Gem::Requirement
+  requirement: &8792960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13100340
+  version_requirements: *8792960
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &13099320 !ruby/object:Gem::Requirement
+  requirement: &8791560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13099320
+  version_requirements: *8791560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13094780 !ruby/object:Gem::Requirement
+  requirement: &8810300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *13094780
+  version_requirements: *8810300
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &13116000 !ruby/object:Gem::Requirement
+  requirement: &8807920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13116000
+  version_requirements: *8807920
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email:
@@ -106,6 +106,7 @@ files:
 - lib/page_object_wrapper/known_elements.rb
 - lib/version.rb
 - page_object_wrapper.gemspec
+- spec/currents_spec.rb
 - spec/define_page_object_spec.rb
 - spec/feed_xxx_spec.rb
 - spec/fire_xxx_and_validate_xxx_spec.rb
@@ -147,6 +148,7 @@ signing_key:
 specification_version: 3
 summary: Wraps watir-webdriver with convenient testing interface.
 test_files:
+- spec/currents_spec.rb
 - spec/define_page_object_spec.rb
 - spec/feed_xxx_spec.rb
 - spec/fire_xxx_and_validate_xxx_spec.rb