RubyGems - page-object - Versions diffs - 0.2.3 → 0.2.4 - Mend

page-object 0.2.3 → 0.2.4

Files changed (43) hide show

data/.rvmrc +1 -1
data/ChangeLog +14 -1
data/features/button.feature +1 -0
data/features/html/static_elements.html +1 -1
data/features/page_level_actions.feature +9 -0
data/features/span.feature +1 -0
data/features/step_definitions/page_level_actions_steps.rb +7 -0
data/features/support/page.rb +2 -0
data/lib/page-object.rb +14 -0
data/lib/page-object/accessors.rb +39 -19
data/lib/page-object/elements/button.rb +5 -1
data/lib/page-object/elements/check_box.rb +19 -0
data/lib/page-object/elements/radio_button.rb +20 -1
data/lib/page-object/elements/span.rb +5 -1
data/lib/page-object/elements/text_area.rb +18 -0
data/lib/page-object/elements/text_field.rb +18 -0
data/lib/page-object/platforms/selenium/check_box.rb +29 -0
data/lib/page-object/platforms/selenium/element.rb +2 -2
data/lib/page-object/platforms/selenium/page_object.rb +18 -2
data/lib/page-object/platforms/selenium/radio_button.rb +29 -0
data/lib/page-object/platforms/selenium/select_list.rb +7 -0
data/lib/page-object/platforms/selenium/text_area.rb +17 -0
data/lib/page-object/platforms/selenium/text_field.rb +17 -0
data/lib/page-object/platforms/watir/check_box.rb +29 -0
data/lib/page-object/platforms/watir/element.rb +0 -7
data/lib/page-object/platforms/watir/page_object.rb +16 -0
data/lib/page-object/platforms/watir/radio_button.rb +29 -0
data/lib/page-object/platforms/watir/select_list.rb +7 -0
data/lib/page-object/platforms/watir/text_area.rb +16 -0
data/lib/page-object/platforms/watir/text_field.rb +16 -0
data/lib/page-object/version.rb +1 -1
data/page-object.gemspec +1 -1
data/spec/page-object/elements/button_spec.rb +2 -2
data/spec/page-object/elements/check_box_spec.rb +25 -0
data/spec/page-object/elements/element_spec.rb +20 -0
data/spec/page-object/elements/radio_button_spec.rb +24 -0
data/spec/page-object/elements/select_list_spec.rb +6 -1
data/spec/page-object/elements/span_spec.rb +2 -2
data/spec/page-object/elements/table_spec.rb +4 -6
data/spec/page-object/elements/text_area_spec.rb +12 -0
data/spec/page-object/elements/text_field_spec.rb +14 -1
data/spec/page-object/page-object_spec.rb +22 -0
metadata +11 -3

data/.rvmrc CHANGED

	@@ -1 +1 @@
1	- rvm 1.9.2-~~p180~~@page-object --create
1	+ rvm 1.9.2-p290@page-object --create

data/ChangeLog CHANGED

@@ -1,9 +1,22 @@
+=== Version 0.2.4 / 2011-08-80
+* Ehnancements
+  * Can now find span by :text
+  * Can now find button by :value
+  * Added #forward and #back methods to PageObject
+  * Added #right_click and #double_click methods to Element
+  * Added #value= to TextField and TextArea
+  * Added #select to SelectList
+  * Added #check, #uncheck, and #checked? to CheckBox
+  * Added #select, #clear, and #selected? to RadioButton
+  * Can properly pass blocks to all accessor methods
+  * Updated to use watir-webdriver 0.3.0
 === Version 0.2.3 / 2011-08-01
 * Enhancements
   * Can now find a TableCell by its' text
   * If we receive an error calling #attach_to_window, wait one second and try again
   * Will call callback method #initialize_page method if it exists on a page object
-  * Renamed all *_<element_type> methods to *_element.  Created alias for backward compatability
+  * Renamed all *_<element_type> methods to *_element.  Created alias for backward compatibility
   * Delegating unknown method calls on Element to the driver element object
   * Improved block handling when passed to element creation method
   * Updated to use selenium-webdriver 2.3.2

data/features/button.feature CHANGED

@@ -26,6 +26,7 @@ Feature: Button
     | name      |
     | xpath     |
     | index     |
+    | value     |
   @watir_only
   Scenario Outline: Locating buttons on Watir only

data/features/html/static_elements.html CHANGED

@@ -1,4 +1,4 @@
-html>
+<html>
 <head>
     <title>Static Elements Page</title>
 </head>

data/features/page_level_actions.feature CHANGED

@@ -40,3 +40,12 @@ Feature: Page level actions
   Scenario: Refreshing the page
     Then I should be able to refresh the page
+  Scenario: Going back and forward
+    When I select the link labeled "Google Search"
+    Then the page should contain the text "Success"
+    When I press the back button
+    Then the page should contain the text "Static Elements Page"
+    When I press the forward button
+    Then the page should contain the text "Success"

data/features/span.feature CHANGED

@@ -18,6 +18,7 @@ Feature: Span
     | xpath     |
     | index     |
     | name      |
+    | text      |
   Scenario Outline: Locating span using multiple parameters
     When I search for the span by "<param1>" and "<param2>"

data/features/step_definitions/page_level_actions_steps.rb CHANGED

@@ -70,4 +70,11 @@ Then /^I should be able to refresh the page$/ do
   @page.refresh
 end
+When /^I press the back button$/ do
+  @page.back
+end
+When /^I press the forward button$/ do
+  @page.forward
+end

data/features/support/page.rb CHANGED

@@ -92,6 +92,7 @@ class Page
   span(:span_name, :name => 'span_name')
   span(:span_class, :class => 'span_class')
   span(:span_index, :index => 0)
+  span(:span_text, :text => 'My alert')
   span(:span_xpath, :xpath => '//span')
   span(:span_class_index, :class => "span_class", :index => 0)
   span(:span_name_index, :name => "span_name", :index => 0)
@@ -119,6 +120,7 @@ class Page
   button(:button_index, :index => 0)
   button(:button_xpath, :xpath=> "//input[@type='submit']")
   button(:button_text, :text => 'Click Me')
+  button(:button_value, :value => 'Click Me')
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)

data/lib/page-object.rb CHANGED

@@ -176,6 +176,20 @@ module PageObject
   def refresh
     platform.refresh
   end
+  #
+  # Go back to the previous page
+  #
+  def back
+    platform.back
+  end
+  #
+  # Go forward to the next page
+  #
+  def forward
+    platform.forward
+  end
   private

data/lib/page-object/accessors.rb CHANGED

@@ -69,10 +69,12 @@ module PageObject
     #
     def text_field(name, identifier=nil, &block)
       define_method(name) do
-        platform.text_field_value_for identifier.clone
+        return platform.text_field_value_for identifier.clone unless block
+        self.send("#{name}_element").value
       end
       define_method("#{name}=") do |value|
-        platform.text_field_value_set(identifier.clone, value)
+        return platform.text_field_value_set(identifier.clone, value) unless block
+        self.send("#{name}_element").value = value
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -104,7 +106,8 @@ module PageObject
     #
     def hidden_field(name, identifier=nil, &block)
       define_method(name) do
-        platform.hidden_field_value_for identifier.clone
+        return platform.hidden_field_value_for identifier.clone unless block
+        self.send("#{name}_element").value
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -136,10 +139,12 @@ module PageObject
     #
     def text_area(name, identifier=nil, &block)
       define_method(name) do
-        platform.text_area_value_for identifier.clone
+        return platform.text_area_value_for identifier.clone unless block
+        self.send("#{name}_element").value
       end
       define_method("#{name}=") do |value|
-        platform.text_area_value_set(identifier.clone, value)
+        return platform.text_area_value_set(identifier.clone, value) unless block
+        self.send("#{name}_element").value = value
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -171,10 +176,12 @@ module PageObject
     #
     def select_list(name, identifier=nil, &block)
       define_method(name) do
-        platform.select_list_value_for identifier.clone
+        return platform.select_list_value_for identifier.clone unless block
+        self.send("#{name}_element").value
       end
       define_method("#{name}=") do |value|
-        platform.select_list_value_set(identifier.clone, value)
+        return platform.select_list_value_set(identifier.clone, value) unless block
+        self.send("#{name}_element").select(value)
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -208,7 +215,8 @@ module PageObject
     #
     def link(name, identifier=nil, &block)
       define_method(name) do
-        platform.click_link_for identifier.clone
+        return platform.click_link_for identifier.clone unless block
+        self.send("#{name}_element").click
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -238,13 +246,16 @@ module PageObject
     #
     def checkbox(name, identifier=nil, &block)
       define_method("check_#{name}") do
-        platform.check_checkbox(identifier.clone)
+        return platform.check_checkbox(identifier.clone) unless block
+        self.send("#{name}_element").check
       end
       define_method("uncheck_#{name}") do
-        platform.uncheck_checkbox(identifier.clone)
+        return platform.uncheck_checkbox(identifier.clone) unless block
+        self.send("#{name}_element").uncheck
       end
       define_method("#{name}_checked?") do
-        platform.checkbox_checked?(identifier.clone)
+        return platform.checkbox_checked?(identifier.clone) unless block
+        self.send("#{name}_element").checked?
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -275,13 +286,16 @@ module PageObject
     #
     def radio_button(name, identifier=nil, &block)
       define_method("select_#{name}") do
-        platform.select_radio(identifier.clone)
+        return platform.select_radio(identifier.clone) unless block
+        self.send("#{name}_element").select
       end
       define_method("clear_#{name}") do
-        platform.clear_radio(identifier.clone)
+        return platform.clear_radio(identifier.clone) unless block
+        self.send("#{name}_element").clear
       end
       define_method("#{name}_selected?") do
-        platform.radio_selected?(identifier.clone)
+        return platform.radio_selected?(identifier.clone) unless block
+        self.send("#{name}_element").selected?
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -306,12 +320,14 @@ module PageObject
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
     #   * :text => Watir only
+    #   * :value => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
     def button(name, identifier=nil, &block)
       define_method(name) do
-        platform.click_button_for identifier.clone
+        return platform.click_button_for identifier.clone unless block
+        self.send("#{name}_element").click
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -341,7 +357,8 @@ module PageObject
     #
     def div(name, identifier=nil, &block)
       define_method(name) do
-        platform.div_text_for identifier.clone
+        return platform.div_text_for identifier.clone unless block
+        self.send("#{name}_element").text
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -370,7 +387,8 @@ module PageObject
     #
     def span(name, identifier=nil, &block)
       define_method(name) do
-        platform.span_text_for identifier.clone
+        return platform.span_text_for identifier.clone unless block
+        self.send("#{name}_element").text
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -425,7 +443,8 @@ module PageObject
     #
     def cell(name, identifier=nil, &block)
       define_method("#{name}") do
-        platform.cell_text_for identifier.clone
+        return platform.cell_text_for identifier.clone unless block
+        self.send("#{name}_element").text
       end
       define_method("#{name}_element") do
         return call_block(&block) if block
@@ -503,7 +522,8 @@ module PageObject
     #
     def list_item(name, identifier=nil, &block)
       define_method(name) do
-        platform.list_item_text_for identifier.clone
+        return platform.list_item_text_for identifier.clone unless block
+        self.send("#{name}_element").text
       end
       define_method("#{name}_element") do
         return call_block(&block) if block

data/lib/page-object/elements/button.rb CHANGED

@@ -10,7 +10,11 @@ module PageObject
       protected
       def self.watir_finders
-        super + [:text]
+        super + [:text, :value]
+      end
+      def self.selenium_finders
+        super + [:value]
       end
       def include_platform_for platform

data/lib/page-object/elements/check_box.rb CHANGED

@@ -2,6 +2,25 @@ module PageObject
   module Elements
     class CheckBox < Element
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
+      protected
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir/check_box'
+          self.class.send :include, PageObject::Platforms::Watir::CheckBox
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium/check_box'
+          self.class.send :include, PageObject::Platforms::Selenium::CheckBox
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"
+        end
+      end
     end
   end
 end

data/lib/page-object/elements/radio_button.rb CHANGED

@@ -2,6 +2,25 @@ module PageObject
   module Elements
     class RadioButton < Element
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
+      protected
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir/radio_button'
+          self.class.send :include, PageObject::Platforms::Watir::RadioButton
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium/radio_button'
+          self.class.send :include, PageObject::Platforms::Selenium::RadioButton
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"
+        end
+      end
     end
   end
-end
+end

data/lib/page-object/elements/span.rb CHANGED

@@ -5,7 +5,11 @@ module PageObject
       protected
       def self.watir_finders
-        [:class, :id, :index, :xpath]
+        [:class, :id, :index, :text, :xpath]
+      end
+      def self.selenium_finders
+        [:class, :id, :name, :text, :xpath, :index]
       end
     end
   end

data/lib/page-object/elements/text_area.rb CHANGED

@@ -2,6 +2,11 @@ module PageObject
   module Elements
     class TextArea < Element
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
       protected
       def self.watir_finders
@@ -19,6 +24,19 @@ module PageObject
       def self.selenium_mapping
         super.merge({:tag_name => :css})
       end
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir/text_area'
+          self.class.send :include, PageObject::Platforms::Watir::TextArea
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium/text_area'
+          self.class.send :include, PageObject::Platforms::Selenium::TextArea
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"
+        end
+      end
     end
   end
 end

data/lib/page-object/elements/text_field.rb CHANGED

@@ -2,6 +2,11 @@ module PageObject
   module Elements
     class TextField < Element
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
       protected
       def self.watir_finders
@@ -19,6 +24,19 @@ module PageObject
       def self.selenium_mapping
         super.merge({:tag_name => :css})
       end
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir/text_field'
+          self.class.send :include, PageObject::Platforms::Watir::TextField
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium/text_field'
+          self.class.send :include, PageObject::Platforms::Selenium::TextField
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"
+        end
+      end
     end
   end
 end

data/lib/page-object/platforms/selenium/check_box.rb ADDED

@@ -0,0 +1,29 @@
+module PageObject
+  module Platforms
+    module Selenium
+      module CheckBox
+        #
+        # check the checkbox
+        #
+        def check
+          element.click unless selected?
+        end
+        #
+        # uncheck the checkbox
+        #
+        def uncheck
+          element.click if selected?
+        end
+        #
+        # return true if it is checked
+        #
+        def checked?
+          element.selected?
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/selenium/element.rb CHANGED

@@ -86,8 +86,8 @@ module PageObject
         #
         # Click this element
         #
-        def click
-          @element.click
+        def right_click
+          @element.context_click
         end
         #

data/lib/page-object/platforms/selenium/page_object.rb CHANGED

@@ -113,6 +113,22 @@ module PageObject
           @browser.navigate.refresh
         end
+        #
+        # platform method to go back to the previous page
+        # See PageObject#back
+        #
+        def back
+          @browser.navigate.back
+        end
+        #
+        # platform method to go forward to the next page
+        # See PageObject#forward
+        #
+        def forward
+          @browser.navigate.forward
+        end
         #
         # platform method to get the value stored in a text field
         # See PageObject::Accessors#text_field
@@ -561,8 +577,8 @@ module PageObject
           return false if identifier[:index]
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
           return false if identifier[:href] and tag == 'a'
-          return false if identifier[:text] and tag == 'div'
-          return false if identifier[:text] and tag == 'td'
+          return false if identifier[:text] and ['div', 'span', 'td'].include? tag
+          return false if identifier[:value] and tag == 'input' and additional[:type] == 'submit'
           true
         end

data/lib/page-object/platforms/selenium/radio_button.rb ADDED

@@ -0,0 +1,29 @@
+module PageObject
+  module Platforms
+    module Selenium
+      module RadioButton
+        #
+        # select the radiobutton
+        #
+        def select
+          element.click unless selected?
+        end
+        #
+        # clear the radiobutton
+        #
+        def clear
+          element.click if selected?
+        end
+        #
+        # return if it is selected
+        #
+        def selected?
+          element.selected?
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/selenium/select_list.rb CHANGED

@@ -12,6 +12,13 @@ module PageObject
         def [](idx)
           options[idx]
         end
+        #
+        # Select a value from the list
+        #
+        def select(value)
+          @element.send_keys(value)
+        end
         #
         # Return an array of Options contained in the select lit.

data/lib/page-object/platforms/selenium/text_area.rb ADDED

@@ -0,0 +1,17 @@
+module PageObject
+  module Platforms
+    module Selenium
+      module TextArea
+        #
+        # Set the value of the TextArea
+        #
+        def value=(new_value)
+          element.clear
+          element.send_keys(new_value)
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/selenium/text_field.rb ADDED

@@ -0,0 +1,17 @@
+module PageObject
+  module Platforms
+    module Selenium
+      module TextField
+        #
+        # Set the value of the TextField
+        #
+        def value=(new_value)
+          element.clear
+          element.send_keys(new_value)
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/watir/check_box.rb ADDED

@@ -0,0 +1,29 @@
+module PageObject
+  module Platforms
+    module Watir
+      module CheckBox
+        #
+        # check the checkbox
+        #
+        def check
+          element.set
+        end
+        #
+        # uncheck the checkbox
+        #
+        def uncheck
+          element.clear
+        end
+        #
+        # return true if checkbox is checked
+        #
+        def checked?
+          element.set?
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/watir/element.rb CHANGED

@@ -83,13 +83,6 @@ module PageObject
           @element.attribute_value attribute_name
         end
-        #
-        # Click this element
-        #
-        def click
-          @element.click
-        end
         #
         # Waits until the element is present
         #

data/lib/page-object/platforms/watir/page_object.rb CHANGED

@@ -95,6 +95,22 @@ module PageObject
     def refresh
       @browser.refresh
     end
+    #
+    # platform method to go back to the previous page
+    # See PageObject#back
+    #
+    def back
+      @browser.back
+    end
+    #
+    # platform method to go forward to the next page
+    # See PageObject#forward
+    #
+    def forward
+      @browser.forward
+    end
     #
     # platform method to get the value stored in a text field

data/lib/page-object/platforms/watir/radio_button.rb ADDED

@@ -0,0 +1,29 @@
+module PageObject
+  module Platforms
+    module Watir
+      module RadioButton
+        #
+        # select the radiobutton
+        #
+        def select
+          element.set
+        end
+        #
+        # clear the radiobutton
+        #
+        def clear
+          element.clear
+        end
+        #
+        # return if it is selected
+        #
+        def selected?
+          element.set?
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/watir/select_list.rb CHANGED

@@ -13,6 +13,13 @@ module PageObject
           PageObject::Elements::Option.new(options[idx], :platform => :watir)
         end
+        #
+        # Select a value from the list
+        #
+        def select(value)
+          @element.select(value)
+        end
         #
         # Return an array of Options contained in the select lit.
         #

data/lib/page-object/platforms/watir/text_area.rb ADDED

@@ -0,0 +1,16 @@
+module PageObject
+  module Platforms
+    module Watir
+      module TextArea
+        #
+        # Set the value of the TextArea
+        #
+        def value=(new_value)
+          element.set(new_value)
+        end
+      end
+    end
+  end
+end

data/lib/page-object/platforms/watir/text_field.rb ADDED

@@ -0,0 +1,16 @@
+module PageObject
+  module Platforms
+    module Watir
+      module TextField
+        #
+        # Set the value of the TextField
+        #
+        def value=(new_value)
+          element.set(new_value)
+        end
+      end
+    end
+  end
+end

data/lib/page-object/version.rb CHANGED

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/page-object.gemspec CHANGED

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency 'watir-webdriver', '>= 0.2.8'
+  s.add_dependency 'watir-webdriver', '>= 0.3.0'
   s.add_dependency 'selenium-webdriver', '>= 2.3.2'
   s.add_development_dependency 'rspec', '>= 2.6.0'

data/spec/page-object/elements/button_spec.rb CHANGED

@@ -6,14 +6,14 @@ describe PageObject::Elements::Button do
   context "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :value, :xpath].each do |t|
         identifier = button.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :value, :xpath].each do |t|
         key, value = button.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/elements/check_box_spec.rb CHANGED

@@ -18,4 +18,29 @@ describe PageObject::Elements::CheckBox do
       end
     end
   end
+  describe "interface" do
+    let(:check_box) { double('check_box') }
+    let(:selenium_cb) { PageObject::Elements::CheckBox.new(check_box, :platform => :selenium) }
+    context "for selenium" do
+      it "should check" do
+        check_box.should_receive(:click)
+        check_box.should_receive(:selected?).and_return(false)
+        selenium_cb.check
+      end
+      it "should uncheck" do
+        check_box.should_receive(:click)
+        check_box.should_receive(:selected?).and_return(true)
+        selenium_cb.uncheck
+      end
+      it "should know if it is checked" do
+        check_box.should_receive(:selected?).and_return(true)
+        selenium_cb.should be_checked
+      end
+    end
+  end
 end

data/spec/page-object/elements/element_spec.rb CHANGED

@@ -139,6 +139,16 @@ describe PageObject::Elements::Element do
       watir_driver.should_receive(:click)
       watir_element.click
     end
+    it "should be double clickable" do
+      watir_driver.should_receive(:double_click)
+      watir_element.double_click
+    end
+    it "should be right clickable" do
+      watir_driver.should_receive(:right_click)
+      watir_element.right_click
+    end
     it "should be able to block until it is present" do
       watir_driver.should_receive(:wait_until_present).with(10)
@@ -222,6 +232,16 @@ describe PageObject::Elements::Element do
       selenium_element.click
     end
+    it "should be double clickable" do
+      selenium_driver.should_receive(:double_click)
+      selenium_element.double_click
+    end
+    it "should be right clickable" do
+      selenium_driver.should_receive(:context_click)
+      selenium_element.right_click
+    end
     it "should be able to block until it is present" do
       wait = double('wait')
       Object::Selenium::WebDriver::Wait.should_receive(:new).and_return(wait)

data/spec/page-object/elements/radio_button_spec.rb CHANGED

@@ -18,4 +18,28 @@ describe PageObject::Elements::RadioButton do
       end
     end
   end
+  describe "interface" do
+    context "for selenium" do
+      let(:selenium_rb) { double('radio_button') }
+      let(:radio_button) { PageObject::Elements::RadioButton.new(selenium_rb, :platform => :selenium) }
+      it "should select" do
+        selenium_rb.should_receive(:click)
+        selenium_rb.should_receive(:selected?).and_return(false)
+        radio_button.select
+      end
+      it "should clear" do
+        selenium_rb.should_receive(:click)
+        selenium_rb.should_receive(:selected?).and_return(true)
+        radio_button.clear
+      end
+      it "should know if it is selected" do
+        selenium_rb.should_receive(:selected?).and_return(true)
+        radio_button.should be_selected
+      end
+    end
+  end
 end

data/spec/page-object/elements/select_list_spec.rb CHANGED

@@ -43,7 +43,6 @@ describe PageObject::Elements::SelectList do
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         watir_sel_list.options.size.should == 2
       end
     end
     context "for selenium" do
@@ -58,6 +57,12 @@ describe PageObject::Elements::SelectList do
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         selenium_sel_list.options.size.should == 2
       end
+      it "should select an element" do
+        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium)
+        sel_list.should_receive(:send_keys).with('something')
+        selenium_sel_list.select 'something'
+      end
     end
   end
 end

data/spec/page-object/elements/span_spec.rb CHANGED

@@ -6,14 +6,14 @@ describe PageObject::Elements::Span do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :xpath].each do |t|
+      [:class, :id, :index, :text, :xpath].each do |t|
         identifier = span.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :text, :xpath].each do |t|
         key, value = span.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/elements/table_spec.rb CHANGED

@@ -27,14 +27,14 @@ describe PageObject::Elements::Table do
     end
     context "for watir" do
+      let(:watir_table) { PageObject::Elements::Table.new(table_element, :platform => :watir) }
       it "should return a table row when indexed" do
-        watir_table = PageObject::Elements::Table.new(table_element, :platform => :watir)
         table_element.stub(:[]).with(1).and_return(table_element)
         watir_table[1].should be_instance_of PageObject::Elements::TableRow
       end
       it "should return the number of rows" do
-        watir_table = PageObject::Elements::Table.new(table_element, :platform => :watir)
         table_element.stub(:wd).and_return(table_element)
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
         table_element.should_receive(:size).and_return(2)
@@ -42,7 +42,6 @@ describe PageObject::Elements::Table do
       end
       it "should iterate over the table rows" do
-        watir_table = PageObject::Elements::Table.new(table_element, :platform => :watir)
         watir_table.should_receive(:rows).and_return(2)
         count = 0
         watir_table.each { |e| count += 1 }
@@ -51,21 +50,20 @@ describe PageObject::Elements::Table do
     end
     context "for selenium" do
+      let(:selenium_table) { PageObject::Elements::Table.new(table_element, :platform => :selenium) }
       it "should return a table row when indexed" do
-        selenium_table = PageObject::Elements::Table.new(table_element, :platform => :selenium)
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
         selenium_table[1].should be_instance_of PageObject::Elements::TableRow
       end
       it "should return the number of rows" do
-        selenium_table = PageObject::Elements::Table.new(table_element, :platform => :selenium)
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
         table_element.should_receive(:size).and_return(2)
         selenium_table.rows.should == 2
       end
       it "should iterate over the table rows" do
-        selenium_table = PageObject::Elements::Table.new(table_element, :platform => :selenium)
         selenium_table.should_receive(:rows).and_return(2)
         count = 0
         selenium_table.each { |e| count += 1 }

data/spec/page-object/elements/text_area_spec.rb CHANGED

@@ -29,4 +29,16 @@ describe PageObject::Elements::TextArea do
       key.should == :css
     end
   end
+  describe "interface" do
+    context "for Selenium" do
+      it "should set its' value" do
+        text_area_element = double('text_area')
+        text_area = PageObject::Elements::TextArea.new(text_area_element, :platform => :selenium)
+        text_area_element.should_receive(:clear)
+        text_area_element.should_receive(:send_keys).with('Joseph')
+        text_area.value = 'Joseph'
+      end
+    end
+  end
 end

data/spec/page-object/elements/text_field_spec.rb CHANGED

@@ -2,9 +2,10 @@ require 'spec_helper'
 require 'page-object/elements'
 describe PageObject::Elements::TextField do
-  let(:textfield) { PageObject::Elements::TextField }
   describe "when mapping how to find an element" do
+    let(:textfield) { PageObject::Elements::TextField }
     it "should map watir types to same" do
       [:class, :id, :index, :name, :tag_name, :xpath].each do |t|
         identifier = textfield.watir_identifier_for t => 'value'
@@ -29,4 +30,16 @@ describe PageObject::Elements::TextField do
       key.should == :css
     end
   end
+  describe "interface" do
+    context "for selenium" do
+      it "should set its' value" do
+        text_field_element = double('selenium_text_field')
+        selenium_text_field = PageObject::Elements::TextField.new(text_field_element, :platform => :selenium)
+        text_field_element.should_receive(:clear)
+        text_field_element.should_receive(:send_keys).with('Joseph')
+        selenium_text_field.value = 'Joseph'
+      end
+    end
+  end
 end

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

@@ -125,6 +125,16 @@ describe PageObject do
         watir_browser.should_receive(:refresh)
         watir_page_object.refresh
       end
+      it "should know how to go back" do
+        watir_browser.should_receive(:back)
+        watir_page_object.back
+      end
+      it "should know how to go forward" do
+        watir_browser.should_receive(:forward)
+        watir_page_object.forward
+      end
     end
     context "when using SeleniumPageObject" do
@@ -193,6 +203,18 @@ describe PageObject do
         selenium_browser.should_receive(:refresh)
         selenium_page_object.refresh
       end
+      it "should know how to go back" do
+        selenium_browser.should_receive(:navigate).and_return(selenium_browser)
+        selenium_browser.should_receive(:back)
+        selenium_page_object.back
+      end
+      it "should know how to go forward" do
+        selenium_browser.should_receive(:navigate).and_return(selenium_browser)
+        selenium_browser.should_receive(:forward)
+        selenium_page_object.forward
+      end
     end
   end
 end

metadata CHANGED

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-08 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -159,25 +159,33 @@ files:
 - lib/page-object/platforms.rb
 - lib/page-object/platforms/selenium.rb
 - lib/page-object/platforms/selenium/button.rb
+- lib/page-object/platforms/selenium/check_box.rb
 - lib/page-object/platforms/selenium/element.rb
 - lib/page-object/platforms/selenium/form.rb
 - lib/page-object/platforms/selenium/image.rb
 - lib/page-object/platforms/selenium/link.rb
 - lib/page-object/platforms/selenium/ordered_list.rb
 - lib/page-object/platforms/selenium/page_object.rb
+- lib/page-object/platforms/selenium/radio_button.rb
 - lib/page-object/platforms/selenium/select_list.rb
 - lib/page-object/platforms/selenium/table.rb
 - lib/page-object/platforms/selenium/table_row.rb
+- lib/page-object/platforms/selenium/text_area.rb
+- lib/page-object/platforms/selenium/text_field.rb
 - lib/page-object/platforms/selenium/unordered_list.rb
 - lib/page-object/platforms/watir.rb
+- lib/page-object/platforms/watir/check_box.rb
 - lib/page-object/platforms/watir/element.rb
 - lib/page-object/platforms/watir/form.rb
 - lib/page-object/platforms/watir/image.rb
 - lib/page-object/platforms/watir/ordered_list.rb
 - lib/page-object/platforms/watir/page_object.rb
+- lib/page-object/platforms/watir/radio_button.rb
 - lib/page-object/platforms/watir/select_list.rb
 - lib/page-object/platforms/watir/table.rb
 - lib/page-object/platforms/watir/table_row.rb
+- lib/page-object/platforms/watir/text_area.rb
+- lib/page-object/platforms/watir/text_field.rb
 - lib/page-object/platforms/watir/unordered_list.rb
 - lib/page-object/version.rb
 - page-object.gemspec