page_object_wrapper 1.3.4 → 1.3.5

data/README.md

@@ -44,64 +44,72 @@ optional arguments are enclosed with [ ]
 
 #### definition example
 
-      PageObjectWrapper.define_page(:some_test_page) do
-        locator 'http://www.cs.tut.fi/~jkorpela/www/testel.html'
-        uniq_h1 :text => 'Testing display of HTML elements'
-
-        elements_set(:test_elements) do
-          text_field(:tf) do
-            locator :id => 'f1'
-            menu :user_defined, 'some food'
-          end
-
-          textarea(:ta) do
-            locator :id => 'f2'
-          end
-          
-          select(:s1) do
-            locator :id => 'f10'
-            menu :fresh_food, 'one'
-            menu :missing_food, 'three'
-          end
-
-          select(:s2) do
-            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' }
-          radio(:rb){ locator :id => 'f3' }
+    PageObjectWrapper.define_page(:some_test_page) do
+      #locator 'http://www.cs.tut.fi/~jkorpela/www/testel.html'
+      locator 'file://'+Dir.pwd+'/good_pages/some_test_page.html'
+      uniq_h1 :text => 'Testing display of HTML elements'
+
+      elements_set(:test_elements) do
+        text_field(:tf) do
+          locator :id => 'f1'
+          menu :user_defined, 'some food'
         end
 
-        action(:press_cool_button, :test_page_with_table) do
-          button(:name => 'foo').when_present.click
+        textarea(:ta) do
+          locator :id => 'f2'
+        end
+        
+        select(:s1) do
+          locator :id => 'f10'
+          menu :fresh_food, 'one'
+          menu :missing_food, 'three'
         end
 
-        action(:fill_textarea, :some_test_page) do |fill_with|
-          data = (fill_with.nil?)? 'Default data' : fill_with
-          textarea(:id => 'f2').set data
+        select(:s2) do
+          locator "form(:action => 'http://www.cs.tut.fi/cgi-bin/run/~jkorpela/echo.cgi').select(:id => 'f11')"
+          menu :fresh_food, 'one'
         end
 
-        action_alias(:fill_textarea_alias, :some_test_page){ action :fill_textarea }
+        checkbox(:cb){ locator :id => 'f5' }
+        radio(:rb){ locator :id => 'f3' }
+      end
 
-        table(:table_without_header) do
-          locator :summary => 'Each row names a Nordic country and specifies its total area and land area, in square kilometers'
-        end
+      action(:press_cool_button, :test_page_with_table) do
+        button(:name => 'foo').when_present.click
+      end
 
-        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]
-        end
+      action(:fill_textarea, :some_test_page) do |fill_with|
+        data = (fill_with.nil?)? 'Default data' : fill_with
+        textarea(:id => 'f2').set data
+      end
 
-        pagination(:some_pagination) do
-          locator :xpath => ''
-        end
+      action :fill_textarea_with_returned_value do |fill_with|
+        data = (fill_with.nil?)? 'Default data' : fill_with
+        textarea(:id => 'f2').set data
+        data
+      end 
 
-        validator(:textarea_value) do |expected|
-          textarea(:id => 'f2').value == expected
-        end
+      action_alias(:fill_textarea_alias, :some_test_page){ action :fill_textarea }
+      action_alias(:fill_textarea_with_returned_value_alias){ action :fill_textarea_with_returned_value }
+
+      table(:table_without_header) do
+        locator :summary => 'Each row names a Nordic country and specifies its total area and land area, in square kilometers'
       end
 
+      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]
+      end
+
+      pagination(:some_pagination) do
+        locator :xpath => ''
+      end
+
+      validator(:textarea_value) do |expected|
+        textarea(:id => 'f2').value == expected
+      end
+    end
+
 here we have defined a page object with locator (url) = 'http://www.cs.tut.fi/~jkorpela/www/testel.html'  
 - uniq\_xxx is used to define a uniq element on that page, which uniquely identifies the page from other pages  
 - uniq\_xxx is being checked when openning the page with PageObjectWrapper.open\_page and when running an page\_object.action  
@@ -210,9 +218,18 @@ next\_page from xxx action
       tp = PageObjectWrapper.current_page
       tp.fire_fill_textarea('User defined data')
 
-    it "returns next_page":
-      tp = PageObjectWrapper.current_page
-      np = tp.fire_press_cool_button
+    context "next_page == nil":
+      it "returns action returned value":
+        tp = PageObjectWrapper.current_page
+        data = tp.fire_fill_textarea_with_returned_value('data to fill with')
+        tp.validate_textarea_value(data).should be(true)
+
+    context "next_page not nil":
+      it "returns next_page":
+        tp = PageObjectWrapper.current_page
+        np = tp.fire_press_cool_button
+        np.should be_a(PageObject)
+        np.label_value.should eq(:test_page_with_table)
 
     context "xxx is alias":
       it "executes corresponding action":
@@ -273,6 +290,12 @@ correct arguments are:
         it "returns nil":
           tp.select_from_table_without_header(:column_0, :column_1 => /123/).should eq nil
           tp.select_from_table_with_header(:country, :total_area => /123/).should eq nil
+        context "found by row number":
+          it "returns found cells":
+            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'
+          it "returns nil":
+            tp.select_from_table_with_header(:country, :row => 123).should eq nil
 
       context "next_page specified":
         context "found by String":
@@ -281,6 +304,12 @@ correct arguments are:
         context "not found by String":
           it "returns nil":
             tp.select_from_table_without_header(:column_0, {:column_1 => '123'}, :some_test_page).should eq nil
+        context "found by row number":
+          it "returns found cells":
+            tp.select_from_table_without_header(:column_0, {:row => 2}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
+            tp.select_from_table_with_header(:country, {:row => 3}, :some_test_page).should eq PageObjectWrapper.receive_page(:some_test_page)
+          it "returns nil":
+            tp.select_from_table_with_header(:country, {:row => 123}, :some_test_page).should eq nil
 
 #### each\_xxx
 TODO

data/bad_pages/bad_page.rb

@@ -20,13 +20,13 @@ PageObjectWrapper.define_page('some_page_with_lost_of_errors') do
     end
   end
 
-  action('',nil) do
+  action('','a string') do
   end
 
   validator('') do
   end
 
-  action_alias('',nil){ action 'unknown action'}
+  action_alias('','a string'){ action 'unknown action'}
 
   table('') do
   end

data/good_pages/some_test_page.rb

@@ -37,7 +37,14 @@ PageObjectWrapper.define_page(:some_test_page) do
     textarea(:id => 'f2').set data
   end
 
+  action :fill_textarea_with_returned_value do |fill_with|
+    data = (fill_with.nil?)? 'Default data' : fill_with
+    textarea(:id => 'f2').set data
+    data
+  end 
+
   action_alias(:fill_textarea_alias, :some_test_page){ action :fill_textarea }
+  action_alias(:fill_textarea_with_returned_value_alias){ action :fill_textarea_with_returned_value }
 
   table(:table_without_header) do
     locator :summary => 'Each row names a Nordic country and specifies its total area and land area, in square kilometers'

data/lib/page_object_wrapper/Action.rb

@@ -2,7 +2,7 @@ require 'Dsl'
 class Action < DslElement
   attr_reader :fire_block_value, :next_page_value
 
-  def initialize(label, next_page, &block)
+  def initialize(label, next_page=nil, &block)
     super label
     @next_page_value = next_page
     @fire_block_value = block

data/lib/page_object_wrapper/PageObject.rb

@@ -195,13 +195,13 @@ class PageObject < DslElementWithLocator
     eset
   end
 
-  def action(label, next_page, &block)
+  def action(label, next_page=nil, &block)
     a = Action.new(label, next_page, &block)
     @actions << a
     a
   end
 
-  def action_alias(label, next_page, &block)
+  def action_alias(label, next_page=nil, &block)
     a = Alias.new(label, next_page)
     a.instance_eval(&block)
     @aliases << a
@@ -256,8 +256,10 @@ class PageObject < DslElementWithLocator
       action_output = []
       action_output << "\taction #{a.label_value.inspect} already defined\n" if labeled(@actions).count(a.label_value) > 1
       action_output << "\tlabel #{a.label_value.inspect} not a Symbol\n" if not a.label_value.is_a?(Symbol)
-      action_output << "\tnext_page #{a.next_page_value.inspect} not a Symbol\n" if not a.next_page_value.is_a? Symbol
-      action_output << "\tnext_page #{a.next_page_value.inspect} unknown page_object\n" if not labeled(@@pages).include?(a.next_page_value)
+      if not a.next_page_value.nil?
+        action_output << "\tnext_page #{a.next_page_value.inspect} not a Symbol\n" if not a.next_page_value.is_a? Symbol
+        action_output << "\tnext_page #{a.next_page_value.inspect} unknown page_object\n" if not labeled(@@pages).include?(a.next_page_value)
+      end
       action_output << "\tfire event is not a Proc\n" if not a.fire_block_value.is_a?(Proc)
       action_output.unshift "action(#{a.label_value.inspect}):\n" if not action_output.empty?
       output += action_output
@@ -266,8 +268,10 @@ class PageObject < DslElementWithLocator
       alias_output = []
       alias_output << "\talias #{a.label_value.inspect} already defined\n" if labeled(@aliases).count(a.label_value) > 1
       alias_output << "\tlabel #{a.label_value.inspect} not a Symbol\n" if not a.label_value.is_a?(Symbol)
-      alias_output << "\tnext_page #{a.next_page_value.inspect} not a Symbol\n" if not a.next_page_value.is_a? Symbol
-      alias_output << "\tnext_page #{a.next_page_value.inspect} unknown page_object\n" if not labeled(@@pages).include?(a.next_page_value)
+      if not a.next_page_value.nil?
+        alias_output << "\tnext_page #{a.next_page_value.inspect} not a Symbol\n" if not a.next_page_value.is_a? Symbol
+        alias_output << "\tnext_page #{a.next_page_value.inspect} unknown page_object\n" if not labeled(@@pages).include?(a.next_page_value)
+      end
       alias_output << "\taction #{a.action_value.inspect} not known Action\n" if not labeled(@actions).include? a.action_value
       alias_output.unshift "alias(#{a.label_value.inspect}):\n" if not alias_output.empty?
       output += alias_output
@@ -358,9 +362,13 @@ private
   def fire_action(a, *args)
     raise PageObjectWrapper::BrowserNotFound if @@browser.nil? or not @@browser.exist?
     block = (a.is_a? Action)? a.fire_block_value : action_for(a.action_value).fire_block_value
-    @@browser.instance_exec *args, &block
-    self.class.map_current_page a.next_page_value
-    @@current_page
+    block_result = @@browser.instance_exec *args, &block
+    if not a.next_page_value.nil?
+      self.class.map_current_page a.next_page_value
+      return @@current_page
+    else
+      return block_result
+    end 
   end
 
   def run_validator(v, *args)

data/lib/page_object_wrapper/version.rb

@@ -1,3 +1,3 @@
 module PageObjectWrapper
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/spec/fire_xxx_and_validate_xxx_spec.rb

@@ -34,20 +34,32 @@ describe "page_object.fire_xxx" do
       tp.validate_textarea_value('User defined data').should be(true)
     end
 
+    context "next_page == nil" do
+      it "returns action returned value" do
+        tp = PageObjectWrapper.current_page
+        data = tp.fire_fill_textarea_with_returned_value('data to fill with')
+        tp.validate_textarea_value(data).should be(true)
+      end
+    end
+
+    context "next_page not nil" do
+      it "returns next_page" do
+        tp = PageObjectWrapper.current_page
+        np = tp.fire_press_cool_button
+        np.should be_a(PageObject)
+        np.label_value.should eq(:test_page_with_table)
+      end
+    end
+
     context "xxx is alias" do
       it "executes corresponding action" do
         tp = PageObjectWrapper.open_page(:some_test_page)
         tp.fire_fill_textarea_alias
         tp.validate_textarea_value('Default data').should be(true)
+        data = tp.fire_fill_textarea_with_returned_value_alias('data to fill with')
+        tp.validate_textarea_value(data).should be(true)
       end
     end
 
-    it "returns next_page" do
-      tp = PageObjectWrapper.current_page
-      np = tp.fire_press_cool_button
-      np.should be_a(PageObject)
-      np.label_value.should eq(:test_page_with_table)
-    end
-
   end
 end

data/spec/load_spec.rb

@@ -31,12 +31,12 @@ elements_set("some elements_set label"):
 		locator {} not a meaningful Hash or String
 action(""):
 	label "" not a Symbol
-	next_page nil not a Symbol
-	next_page nil unknown page_object
+	next_page "a string" not a Symbol
+	next_page "a string" unknown page_object
 alias(""):
 	label "" not a Symbol
-	next_page nil not a Symbol
-	next_page nil unknown page_object
+	next_page "a string" not a Symbol
+	next_page "a string" unknown page_object
 	action "unknown action" not known Action
 validator(""):
 	label "" not a Symbol

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_object_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &14274520 !ruby/object:Gem::Requirement
+  requirement: &14087000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14274520
+  version_requirements: *14087000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14221140 !ruby/object:Gem::Requirement
+  requirement: &14086460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14221140
+  version_requirements: *14086460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14166080 !ruby/object:Gem::Requirement
+  requirement: &14085880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *14166080
+  version_requirements: *14085880
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &14146280 !ruby/object:Gem::Requirement
+  requirement: &14085340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14146280
+  version_requirements: *14085340
 description: Wraps watir-webdriver with convenient testing interface, based on PageObjects
   automation testing pattern. Simplifies resulting automated test understanding.
 email: