page_object_wrapper 1.5.0 → 1.5.1

data/lib/page_object_wrapper.rb

@@ -7,9 +7,7 @@ module PageObjectWrapper
   @@domain = nil
   @@browser = nil
   @@current_page = nil
-  @@current_action_result = nil
-  @@current_table_row = nil
-  @@current_table_cell = nil
+  @@current_result = nil
 
   def self.domain=val
     @@domain=val
@@ -38,33 +36,22 @@ module PageObjectWrapper
     @@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
+  def self.current_page? label
+    PageObject.map_current_page label
+    true
   end
 
-  def self.current_table_cell= res
-    @@current_table_cell = res
+  def self.current_result= res
+    @@current_result = res
   end
 
-  def self.current_table_cell
-    @@current_table_cell
+  def self.current_result
+    @@current_result
   end
 
-  def self.current_page? label
-    PageObject.map_current_page label
-    true
+  def self.current_result? post_processing, excpected_value
+    real_value = @@current_result.instance_eval post_processing.to_s
+    real_value == excpected_value
   end
 
   def self.load(path_to_pages='.')

data/lib/page_object_wrapper/PageObject.rb

@@ -59,58 +59,58 @@ module PageObjectWrapper
         when has_eset?(method_name)
           # page_object.some_elements_set
           eset = eset_for(method_name)
-          PageObjectWrapper.current_action_result = PageObject.return_array_of_watir_elements(eset)
+          PageObjectWrapper.current_result = PageObject.return_array_of_watir_elements(eset)
         when has_element?(method_name)
           # page_object.some_element
           element = element_for(method_name)
-          PageObjectWrapper.current_action_result = PageObject.return_watir_element element
+          PageObjectWrapper.current_result = PageObject.return_watir_element element
         when FEED_ALL.match(method_name)
           # page_object.feed_all(:fresh_food)
-          PageObjectWrapper.current_action_result = feed_elements(@elements, *args)
+          PageObjectWrapper.current_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)
-          PageObjectWrapper.current_action_result = feed_elements(eset.elements, *args)
+          PageObjectWrapper.current_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 
-            PageObjectWrapper.current_action_result = feed_field(e, args[0])
+            PageObjectWrapper.current_result = feed_field(e, args[0])
           else
-            PageObjectWrapper.current_action_result = feed_elements([e], *args)
+            PageObjectWrapper.current_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)
-          PageObjectWrapper.current_action_result = fire_action(a, *args)
+          PageObjectWrapper.current_result = fire_action(a, *args)
         when (FIRE_ACTION.match(method_name) and has_alias?($1))
           # page_object.fire_some_action
           a = alias_for($1)
-          PageObjectWrapper.current_action_result = fire_action(a, *args)
+          PageObjectWrapper.current_result = fire_action(a, *args)
         when (VALIDATE.match(method_name) and has_validator?($1))
           # page_object.validate_something
           v = validator_for($1)
-          PageObjectWrapper.current_action_result = run_validator(v, *args)
+          PageObjectWrapper.current_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)
-          PageObjectWrapper.current_table_cell = select_from(table, *args)
+          PageObjectWrapper.current_result = 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)
-          PageObjectWrapper.current_table_row = select_row_from(table, args[0])
+          PageObjectWrapper.current_result = select_row_from(table, args[0])
         when (PAGINATION_EACH.match(method_name) and has_pagination?($1))
           # page_object.each_pagination
           pagination = pagination_for($1)
-          PageObjectWrapper.current_action_result = run_each_subpage(pagination, *args, &block)
+          PageObjectWrapper.current_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)
-          PageObjectWrapper.current_action_result = open_subpage(pagination, *args)
+          PageObjectWrapper.current_result = open_subpage(pagination, *args)
         when (PRESS.match(method_name) and has_element?($1))
           # page_object.press_element
           element = element_for($1)
-          PageObjectWrapper.current_action_result = press(element)
+          PageObjectWrapper.current_result = press(element)
         else
           super
       end

data/lib/version.rb

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

data/spec/currents_spec.rb

@@ -10,33 +10,28 @@ describe "returned values" do
   
   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
+    PageObjectWrapper.current_page.should be_a PageObjectWrapper::PageObject
+    PageObjectWrapper.current_page?(:some_test_page).should eq true
 
     tp.feed_tf 'text'
-    res = PageObjectWrapper.current_action_result
-    res.should be_a Watir::TextField
-    res.value.should eq 'text'
+    PageObjectWrapper.current_result.should be_a Watir::TextField
+    PageObjectWrapper.current_result?(:value, 'text').should eq true
 
     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"]
+    expected = ["bar", "tf food", "ta food", "1", "2", "on", "on", "one", "one"]
+    PageObjectWrapper.current_result.should be_a Array
+    PageObjectWrapper.current_result?("collect(&:value)", expected).should eq true
 
     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
+    PageObjectWrapper.current_result.should be_a PageObjectWrapper::PageObject
+    PageObjectWrapper.current_result?(:label_value, :test_page_with_table).should eq true
     
     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'
+    PageObjectWrapper.current_result.should be_a Watir::TableCell
+    PageObjectWrapper.current_result?(:text, '42').should eq true
 
     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'
+    PageObjectWrapper.current_result.should be_a Hash
+    PageObjectWrapper.current_result?("fetch(:column_1).text", '42').should eq true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &8756800 !ruby/object:Gem::Requirement
+  requirement: &11013380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8756800
+  version_requirements: *11013380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &8792960 !ruby/object:Gem::Requirement
+  requirement: &11048940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8792960
+  version_requirements: *11048940
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &8791560 !ruby/object:Gem::Requirement
+  requirement: &11047780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8791560
+  version_requirements: *11047780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8810300 !ruby/object:Gem::Requirement
+  requirement: &11066000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *8810300
+  version_requirements: *11066000
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &8807920 !ruby/object:Gem::Requirement
+  requirement: &11063740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8807920
+  version_requirements: *11063740
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email: