page-object 0.7.4 → 0.7.5

data/.rvmrc

@@ -1 +1,2 @@
-rvm 1.9.3-p194@page-object --create
+rvm --create use 1.9.3-p194@page-object  
+

data/ChangeLog

@@ -1,3 +1,11 @@
+=== Version 0.7.5 / 2012-10-14
+* Enhancements
+  * Enhanced TabeleCell to return nil when there is no corresponding  cell for a referenced column
+  * Added css selector support for SelectList and Div
+  * Added ability to pass clasname as string to visit_page, on_page, and if_page methods
+  * Added params class instance variable to hold hash values that can be used in the page
+  * Added ability to insert ERB into page_url string and have it access params
+
 === Version 0.7.4 / 2012-9-8
 * Enhancements
   * Added ability to find text_fields with :css when using Selenium

data/features/div.feature

@@ -29,6 +29,15 @@ Feature: Div
     | text      |
     | title     |
 
+  @selenium_only
+  Scenario Outline: Locating divs on the page
+    When I search for the div by "<search_by>"
+    Then the text should be "page-object rocks!"
+
+  Scenarios:
+    | search_by |
+    | css       |
+
   Scenario Outline: Locating divs using multiple parameters
     When I search for the div by "<param1>" and "<param2>"
     Then the text should be "page-object rocks!"

data/features/html/static_elements.html

@@ -100,6 +100,9 @@
           <td>Data3</td>
           <td>Data4</td>
         </tr>
+        <tr>
+          <td>Data5</td>
+        </tr>
       </tbody>
     </table>
 

data/features/select_list.feature

@@ -24,6 +24,17 @@ Feature: Select List
     | xpath     |
     | index     |
 
+  @selenium_only
+  Scenario Outline: Locating select lists on the Page using Selenium
+    When I search for the select list by "<search_by>"
+    Then I should be able to select "Test 2"
+    And the value for the selected item should be "Test 2"
+    And the value for the option should be "option2"
+
+  Examples:
+    | search_by |
+    | css       |
+
   Scenario Outline: Locating a select list using multiple parameters
     When I search for the select list by "<param1>" and "<param2>"
     Then I should be able to select "Test 2"

data/features/step_definitions/link_steps.rb

@@ -20,7 +20,5 @@ When /^I select a link while the script is executing$/ do
 end
 
 Then /^I should see that the link exists$/ do
-  require 'ruby-debug'
-  debugger
   @page.link_id?.should == true
 end

data/features/support/page.rb

@@ -60,6 +60,7 @@ class Page
 
   select_list(:sel_list_id, :id => "sel_list_id")
   select_list(:sel_list_class, :class => "sel_list_class")
+  select_list(:sel_list_css, :css => ".sel_list_class")
   select_list(:sel_list_index, :index => 0)
   select_list(:sel_list_name, :name => "sel_list_name")
   select_list(:sel_list_value, :value => "option1")
@@ -98,6 +99,7 @@ class Page
   div(:div_title, :title => 'div_title')
   div(:div_class_index, :class => "div_class", :index => 0)
   div(:div_name_index, :name => "div_name", :index => 0)
+  div(:div_css, :css => ".div_class")
 
   span(:span_id, :id => 'span_id')
   span(:span_name, :name => 'span_name')

data/features/table.feature

@@ -70,6 +70,10 @@ Feature: Table
     When I retrieve a table element
     Then the data for row "Data3" and column "Data20" should be nil
 
+  Scenario: Retrieve data from a table that does not have a cell which corresponds to a column header
+    When I retrieve a table with thead element
+    Then the data for row "Data5" and column "Col2" should be nil
+
   Scenario Outline: Locating table cells on the Page
     When I retrieve a table element by "<search_by>"
     Then the data for row "1" should be "Data1" and "Data2"

data/lib/page-object/accessors.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module PageObject
   #
   # Contains the class level methods that are inserted into your page objects
@@ -9,6 +11,24 @@ module PageObject
   #
   module Accessors
 
+    #
+    # Set some values that can be used withing the class.  This is
+    # typically used to provide values that help build dynamic urls in
+    # the page_url method
+    #
+    # @param [Hash] the value to set the params
+    #
+    def params=(the_params)
+      @params = the_params
+    end
+
+    #
+    # Return the params that exist on this page class
+    #
+    def params
+      @params ||= {}
+    end
+
     #
     # Specify the url for the page.  A call to this method will generate a
     # 'goto' method to take you to the page.
@@ -19,7 +39,10 @@ module PageObject
     def page_url(url)
       define_method("goto") do
         url = url.kind_of?(Symbol) ? self.send(url) : url
-        platform.navigate_to url
+        erb = ERB.new(%Q{#{url}})
+        merged_params = self.class.instance_variable_get("@merged_params")
+        params = merged_params ? merged_params : self.class.params
+        platform.navigate_to erb.result(binding)
       end
     end
     alias_method :direct_url, :page_url
@@ -221,6 +244,7 @@ module PageObject
     # @param [Hash] identifier how we find a select list.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Selenium only
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
@@ -437,6 +461,7 @@ module PageObject
     # @param [Hash] identifier how we find a div.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
+    #   * :css => Selenium only
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium

data/lib/page-object/elements/div.rb

@@ -9,7 +9,7 @@ module PageObject
       end
       
       def self.selenium_finders
-        super + [:text, :title]
+        super + [:text, :title, :css]
       end
       
     end

data/lib/page-object/elements/select_list.rb

@@ -18,6 +18,10 @@ module PageObject
         super + [:text, :value]
       end
 
+      def self.selenium_finders
+        super + [:css]
+      end
+
       def include_platform_for platform
         super
         if platform[:platform] == :watir_webdriver

data/lib/page-object/page_factory.rb

@@ -35,11 +35,14 @@ module PageObject
     # Create and navigate to a page object.  The navigation will only work if the
     # 'page_url' method was call on the page object.
     #
-    # @param [PageObject] a class that has included the PageObject module
+    # @param [PageObject, String] a class that has included the PageObject module or a string containing the name of the class 
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
-    def visit_page(page_class, &block)
+    def visit_page(page_class, params={:using_params => {}}, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
+      merged = page_class.params.merge(params[:using_params])
+      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       on_page page_class, true, &block
     end
 
@@ -49,12 +52,13 @@ module PageObject
     #
     # Create a page object.
     #
-    # @param [PageObject]  a class that has included the PageObject module
+    # @param [PageObject, String]  a class that has included the PageObject module or a string containing the name of the class
     # @param [Boolean]  a boolean indicating if the page should be visited?  default is false.
     # @param [block]  an optional block to be called
     # @return [PageObject] the newly created page object
     #
     def on_page(page_class, visit=false, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
       @current_page = page_class.new(@browser, visit)
       block.call @current_page if block
       @current_page
@@ -66,11 +70,12 @@ module PageObject
     #
     # Create a page object if and only if the current page is the same page to be created
     #
-    # @param [PageObject]  a class that has included the PageObject module
+    # @param [PageObject, String]  a class that has included the PageObject module or a string containing the name of the class
     # @param [block]  an optional block to be called
     # @return [PageObject] the newly created page object
     #
     def if_page(page_class, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
       return @current_page unless @current_page.class == page_class
       on_page(page_class, false, &block)
     end
@@ -128,7 +133,13 @@ module PageObject
     end
 
     private
-
+    
+    def class_from_string(str)
+      str.split('::').inject(Object) do |mod, class_name|
+        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

data/lib/page-object/platforms/selenium_webdriver/table_row.rb

@@ -13,7 +13,7 @@ module PageObject
         def [](idx)
           els = table_cells
           idx = find_index_by_title(idx) if idx.kind_of?(String)
-          return nil unless idx
+          return nil unless idx  && columns >= idx + 1
           Object::PageObject::Elements::TableCell.new(els[idx], :platform => :selenium_webdriver)
         end
 

data/lib/page-object/platforms/watir_webdriver/table_row.rb

@@ -11,7 +11,7 @@ module PageObject
         #
         def [](idx)
           idx = find_index_by_title(idx) if idx.kind_of?(String)
-          return nil unless idx
+          return nil unless idx && columns >= idx + 1
           Object::PageObject::Elements::TableCell.new(element[idx], :platform => :watir_webdriver)
         end
 

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/pageobject.gems

@@ -0,0 +1 @@
+bundler

data/spec/page-object/elements/table_row_spec.rb

@@ -14,6 +14,7 @@ describe PageObject::Elements::TableRow do
     context "for selenium" do
       it "should return a table cell when indexed" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
+        table_row.stub(:columns).and_return(2)
         table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_cell)
         table_cell.should_receive(:[]).and_return(table_cell)
         table_row[0].should be_instance_of PageObject::Elements::TableCell
@@ -43,6 +44,7 @@ describe PageObject::Elements::TableRow do
 
       it "should return a table cell when indexed" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
+        table_row.stub(:columns).and_return(2)
         table_row_driver.should_receive(:[]).with(1).and_return(table_cell)
         table_row[1].should be_instance_of PageObject::Elements::TableCell
       end

data/spec/page-object/page-object_spec.rb

@@ -13,7 +13,7 @@ describe PageObject do
   let(:watir_page_object) { PageObjectTestPageObject.new(watir_browser) }
   let(:selenium_page_object) { PageObjectTestPageObject.new(selenium_browser) }
 
-  context "setting values for the Javascript Framework" do
+  context "setting values on the PageObject module" do
     it "should set the javascript framework" do
       PageObject::JavascriptFrameworkFacade.should_receive(:framework=)
       PageObject.javascript_framework = :foo
@@ -23,8 +23,58 @@ describe PageObject do
       PageObject::JavascriptFrameworkFacade.should_receive(:add_framework)
       PageObject.add_framework(:foo, :bar)
     end
+
+    it "should set a default page wait value" do
+      PageObject.default_page_wait = 20
+      wait = PageObject.instance_variable_get("@page_wait")
+      wait.should == 20
+    end
+
+    it "should provide the default page wait value" do
+      PageObject.instance_variable_set("@page_wait", 10)
+      PageObject.default_page_wait.should == 10
+    end
+
+    it "should default the page wait value to 30" do
+      PageObject.instance_variable_set("@page_wait", nil)
+      PageObject.default_page_wait.should == 30
+    end
+
+    it "should set the default element wait value" do
+      PageObject.default_element_wait = 20
+      wait = PageObject.instance_variable_get("@element_wait")
+      wait.should == 20
+    end
+
+    it "should provide the default element wait value" do
+      PageObject.instance_variable_set("@element_wait", 10)
+      PageObject.default_element_wait.should == 10
+    end
+
+    it "should default the element wait to 5" do
+      PageObject.instance_variable_set("@element_wait", nil)
+      PageObject.default_element_wait.should == 5
+    end
   end
-  
+
+  context "setting values on the PageObject class instance" do
+    it "should set the params value" do
+      PageObjectTestPageObject.params = {:some => :value}
+      params = PageObjectTestPageObject.instance_variable_get("@params")
+      params[:some].should == :value
+    end
+
+    it "should provide the params value" do
+      PageObjectTestPageObject.instance_variable_set("@params", {:value => :updated})
+      PageObjectTestPageObject.params[:value].should == :updated
+    end
+
+    it "should default the params to an empty hash" do
+      PageObjectTestPageObject.instance_variable_set("@params", nil)
+      PageObjectTestPageObject.params.should == {}
+    end
+  end
+
   context "when created with a watir-webdriver browser" do
     it "should include the WatirPageObject module" do
       watir_page_object.platform.should be_kind_of PageObject::Platforms::WatirWebDriver::PageObject

data/spec/page-object/page_factory_spec.rb

@@ -19,6 +19,13 @@ class YetAnotherPage
   include PageObject
 end
 
+module ContainingModule
+    class PageInsideModule
+      include PageObject
+      page_url "http://google.co.uk"
+    end
+end
+
 class TestWorld
   include PageObject::PageFactory
   attr_accessor :browser
@@ -36,6 +43,12 @@ describe PageObject::PageFactory do
     @world.on_page FactoryTestPage do |page|
       page.should be_instance_of FactoryTestPage
     end
+    @world.on_page "FactoryTestPage" do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+    @world.on_page "ContainingModule::PageInsideModule" do |page|
+      page.should be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create a new page object and execute a block using 'on'" do
@@ -43,20 +56,65 @@ describe PageObject::PageFactory do
     @world.on FactoryTestPage do |page|
       page.should be_instance_of FactoryTestPage
     end
+    @world.on "FactoryTestPage" do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+    @world.on "ContainingModule::PageInsideModule" do |page|
+      page.should be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create and visit a new page" do
-    @world.browser.should_receive(:goto)
+    @world.browser.should_receive(:goto).exactly(3).times
     @world.visit_page FactoryTestPage do |page|
       page.should be_instance_of FactoryTestPage
     end
+    @world.visit_page "FactoryTestPage" do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+    @world.visit_page "ContainingModule::PageInsideModule" do |page|
+      page.should be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
-  it "should create and visit a new page using 'visit'" do
+  it "should merge params with the class level params if provided when visiting" do
     @world.browser.should_receive(:goto)
+    FactoryTestPage.params = {:initial => :value}
+    @world.visit_page(FactoryTestPage, :using_params => {:new_value => :merged})
+    merged = FactoryTestPage.instance_variable_get("@merged_params")
+    merged[:initial].should == :value
+    merged[:new_value].should == :merged
+  end
+
+  it "should use the params in the url when they are provided" do
+    class PageUsingParams
+      include PageObject
+      page_url "http://google.com/<%=params[:value]%>"
+    end
+    @world.browser.should_receive(:goto).with("http://google.com/PageObject")
+    @world.visit_page(PageUsingParams, :using_params => {:value => 'PageObject'})
+  end
+
+  it "should use the params as well as interpolated values" do
+    class PageUsingParmsAndInterpolated
+      include PageObject
+      page_url "http://google.com/#{1+2}/<%=params[:value]%>"
+    end
+    @world.browser.should_receive(:goto).with("http://google.com/3/PageObject")
+    @world.visit_page(PageUsingParmsAndInterpolated, :using_params => {:value => 'PageObject'})
+  end
+
+  it "should create and visit a new page using 'visit'" do
+    @world.browser.should_receive(:goto).exactly(3).times
     @world.visit FactoryTestPage do |page|
       page.should be_instance_of FactoryTestPage
     end
+    @world.visit "FactoryTestPage" do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+    @world.visit "ContainingModule::PageInsideModule" do |page|
+      page.should be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create and visit a new page when url is defined as 'direct_url'" do
@@ -77,19 +135,46 @@ describe PageObject::PageFactory do
     @world.if_page(FactoryTestPage) do |page|
       fail
     end
+    @world.if_page("FactoryTestPage") do |page|
+      fail
+    end
+    @world.if_page("ContainingModule::PageInsideModule") do |page|
+      fail
+    end
   end
 
   it "should return the @current_page if asking for another page" do
     expected = TestPageWithDirectUrl.new(@world.browser)
     @world.instance_variable_set "@current_page", expected
     @world.if_page(FactoryTestPage).should == expected
+    @world.if_page("FactoryTestPage").should == expected
+    @world.if_page("ContainingModule::PageInsideModule").should == expected
   end
 
   it "should execute the block when we ask if it is the correct page" do
     @world.instance_variable_set "@current_page", FactoryTestPage.new(@world.browser)
+    
+    done = false
     @world.if_page(FactoryTestPage) do |page|
       page.should be_instance_of FactoryTestPage
+      done = true 
+    end
+    done.should be true
+    
+    done = false
+    @world.if_page("FactoryTestPage") do |page|
+      page.should be_instance_of FactoryTestPage
+      done = true
+    end
+    done.should be true
+    
+    done = false
+    @world.instance_variable_set "@current_page", ContainingModule::PageInsideModule.new(@world.browser) 
+    @world.if_page("ContainingModule::PageInsideModule") do |page|
+      page.should be_instance_of ContainingModule::PageInsideModule
+      done = true
     end
+    done.should be true
   end
 
   it "should raise an error when you do not provide a default route" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -315,6 +315,7 @@ files:
 - lib/page-object/platforms/watir_webdriver/unordered_list.rb
 - lib/page-object/version.rb
 - page-object.gemspec
+- pageobject.gems
 - spec/page-object/element_locators_spec.rb
 - spec/page-object/elements/area_spec.rb
 - spec/page-object/elements/button_spec.rb
@@ -334,15 +335,15 @@ files:
 - spec/page-object/elements/option_spec.rb
 - spec/page-object/elements/ordered_list_spec.rb
 - spec/page-object/elements/paragraph_spec.rb
-- spec/page-object/elements/radio_button_spec.rb
 - spec/page-object/elements/select_list_spec.rb
+- spec/page-object/elements/selenium/radio_button_spec.rb
+- spec/page-object/elements/selenium/text_field_spec.rb
 - spec/page-object/elements/selenium_element_spec.rb
 - spec/page-object/elements/span_spec.rb
 - spec/page-object/elements/table_cell_spec.rb
 - spec/page-object/elements/table_row_spec.rb
 - spec/page-object/elements/table_spec.rb
 - spec/page-object/elements/text_area_spec.rb
-- spec/page-object/elements/text_field_spec.rb
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/elements/watir_element_spec.rb
 - spec/page-object/javascript_framework_facade_spec.rb
@@ -370,7 +371,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -734083501090794232
+      hash: 1948566073686422532
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -379,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -734083501090794232
+      hash: 1948566073686422532
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.24
@@ -517,15 +518,15 @@ test_files:
 - spec/page-object/elements/option_spec.rb
 - spec/page-object/elements/ordered_list_spec.rb
 - spec/page-object/elements/paragraph_spec.rb
-- spec/page-object/elements/radio_button_spec.rb
 - spec/page-object/elements/select_list_spec.rb
+- spec/page-object/elements/selenium/radio_button_spec.rb
+- spec/page-object/elements/selenium/text_field_spec.rb
 - spec/page-object/elements/selenium_element_spec.rb
 - spec/page-object/elements/span_spec.rb
 - spec/page-object/elements/table_cell_spec.rb
 - spec/page-object/elements/table_row_spec.rb
 - spec/page-object/elements/table_spec.rb
 - spec/page-object/elements/text_area_spec.rb
-- spec/page-object/elements/text_field_spec.rb
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/elements/watir_element_spec.rb
 - spec/page-object/javascript_framework_facade_spec.rb