super called when factory method invoked with non PageObject class

ChangeLog

@@ -1,5 +1,6 @@
 === Version 0.9.7
 * Enhancements
+  * super called when factory method invoked with non PageObject class
   * Updated to use the latest watir-webdriver 0.6.8
   * Updated to use the latest selenium-webdriver 2.40.0
 

lib/page-object/page_factory.rb

@@ -68,6 +68,7 @@ def visit_page(page_class, params={:using_params => {}}, &block)
     #
     def on_page(page_class, params={:using_params => {}}, visit=false, &block)
       page_class = class_from_string(page_class) if page_class.is_a? String
+      return super(page_class, params, visit, &block) unless page_class.ancestors.include? PageObject
       merged = page_class.params.merge(params[:using_params])
       page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       @current_page = page_class.new(@browser, visit)

spec/page-object/page_factory_spec.rb

@@ -20,13 +20,21 @@ class YetAnotherPage
 end
 
 module ContainingModule
-    class PageInsideModule
-      include PageObject
-      page_url "http://google.co.uk"
-    end
+  class PageInsideModule
+    include PageObject
+    page_url "http://google.co.uk"
+  end
+end
+
+class WorldSuper
+  attr_reader :super_called
+  def on_page(cls, params={}, visit=false, &block)
+    @super_called = true
+  end
 end
 
-class TestWorld
+
+class TestWorld < WorldSuper
   include PageObject::PageFactory
   attr_accessor :browser
   attr_accessor :current_page
@@ -38,6 +46,13 @@ class TestWorld
     @world.browser = mock_watir_browser
   end
 
+  it "should call super when non page-object class passed " do
+    class NoPO
+    end
+    @world.on(NoPO)
+    @world.super_called.should be_true
+  end
+
   it "should create a new page object and execute a block" do
     @world.browser.should_not_receive(:goto)
     @world.on_page FactoryTestPage do |page|