page-object 0.8.3 → 0.8.4

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 0.8.4 / 2013-1-26
+* Enhancements
+  * Extracted navigational methods into new gem named page_navigation
+
 === Version 0.8.3 / 2013-1-22
 * Enhancements
   * Updated to use the latest selenium-webdriver 2.29

data/lib/page-object/page_factory.rb

@@ -1,3 +1,5 @@
+require 'page_navigation'
+
 module PageObject
   #
   # Module to facilitate to creating of page objects in step definitions.  You
@@ -33,6 +35,8 @@ module PageObject
   # to the method.
   #
   module PageFactory
+    include PageNavigation
+
 
     #
     # Create and navigate to a page object.  The navigation will only work if the
@@ -92,55 +96,6 @@ module PageObject
     # Support 'if' for readability of usage
     alias_method :if, :if_page
 
-    #
-    # Navigate to a specific page following a predefined path.
-    #
-    # This method requires a lot of setup.  See the documentation for
-    # this class.  Once the setup is complete you can navigate to a
-    # page traversing through all other pages along the way.  It will
-    # call the method you specified in the routes for each
-    # page as it navigates.  Using the example setup defined in the
-    # documentation above you can call the method two ways:
-    #
-    # @example
-    #   page.navigate_to(PageThree)  # will use the default path
-    #   page.navigate_to(PageThree, :using => :another_route)
-    #
-    # @param [PageObject]  a class that has included the PageObject
-    # module and which has the navigation_method defined
-    # @param [Hash] a hash that contains an element with the key
-    # :using.  This will be used to lookup the route.  It has a
-    # default value of :default.
-    # @param [block]  an optional block to be called
-    # @return [PageObject] the page you are navigating to
-    #
-    def navigate_to(page_cls, how = {:using => :default}, &block)
-      path = path_for how
-      to_index = find_index_for(path, page_cls)-1
-      navigate_through_pages(path[0..to_index])
-      on_page(page_cls, &block)
-    end
-
-    #
-    # Same as navigate_to except it will start at the @current_page
-    # instead the beginning of the path.
-    #
-    # @param [PageObject]  a class that has included the PageObject
-    # module and which has the navigation_method defined
-    # @param [Hash] a hash that contains an element with the key
-    # :using.  This will be used to lookup the route.  It has a
-    # default value of :default.
-    # @param [block]  an optional block to be called
-    # @return [PageObject] the page you are navigating to
-    #
-    def continue_navigation_to(page_cls, how = {:using => :default}, &block)
-      path = path_for how
-      from_index = find_index_for(path, @current_page.class)+1
-      to_index = find_index_for(path, page_cls)-1
-      navigate_through_pages(path[from_index..to_index])
-      on_page(page_cls, &block)
-    end
-
     private
     
     def class_from_string(str)
@@ -148,33 +103,5 @@ module PageObject
         mod.const_get(class_name)
       end
     end
-    
-    def path_for(how)
-      path = PageObject::PageFactory.page_object_routes[how[:using]]
-      fail("PageFactory route :#{how[:using].to_s} not found") unless path
-      path
-    end
-    
-    def navigate_through_pages(pages)
-      pages.each do |cls, method, *args|
-        page = on_page(cls)
-        fail("Navigation method not specified on #{cls}.") unless page.respond_to? method
-        page.send method unless args
-        page.send method, *args if args
-      end
-    end
-
-    def find_index_for(path, item)
-      path.find_index { |each| each[0] == item}
-    end
-
-    class << self
-      attr_accessor :page_object_routes
-      
-      def routes=(routes)
-        raise("You must provide a :default route for PageFactory routes") unless routes[:default]
-        @page_object_routes = routes
-      end
-    end
   end
 end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/page-object.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'watir-webdriver', '>= 0.6.2'
   s.add_dependency 'selenium-webdriver', '>= 2.29.0'
+  s.add_dependency 'page_navigation', '>= 0.3'
 
   s.add_development_dependency 'rspec', '>= 2.12.0'
   s.add_development_dependency 'cucumber', '>= 1.2.0'

data/spec/page-object/page_factory_spec.rb

@@ -184,7 +184,7 @@ describe PageObject::PageFactory do
   it "should store the routes" do
     routes = ['a', 'b', 'c']
     PageObject::PageFactory.routes = {:default => routes}
-    PageObject::PageFactory.page_object_routes[:default].should == routes
+    PageObject::PageFactory.routes[:default].should == routes
   end
 
   it "should navigate to a page calling the default methods" do
@@ -226,12 +226,16 @@ describe PageObject::PageFactory do
                    [AnotherPage, :b_method],
                    [YetAnotherPage, :c_method]]
     }
-    fake_page = double('a_page')
-    AnotherPage.should_receive(:new).and_return(fake_page)
-    fake_page.should_receive(:respond_to?).with(:b_method).and_return(true)
-    fake_page.should_receive(:b_method)
+
     @world.current_page = FactoryTestPage.new(@world.browser)
-    FactoryTestPage.should_not_receive(:new)
+    f_page = FactoryTestPage.new(@world.browser)
+    FactoryTestPage.should_receive(:new).and_return(f_page)
+    f_page.should_receive(:respond_to?).with(:a_method).and_return(true)
+    f_page.should_receive(:a_method)
+    a_page = AnotherPage.new(@world.browser)
+    AnotherPage.should_receive(:new).and_return(a_page)
+    a_page.should_receive(:respond_to?).with(:b_method).and_return(true)
+    a_page.should_receive(:b_method)
     @world.continue_navigation_to(YetAnotherPage).class.should == YetAnotherPage
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.29.0
+- !ruby/object:Gem::Dependency
+  name: page_navigation
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -381,7 +397,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1401660757405095936
+      hash: -1959030872660536496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -390,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1401660757405095936
+      hash: -1959030872660536496
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.24