page-object 0.2.4 → 0.2.5

data/lib/page-object/element_locators.rb

@@ -0,0 +1,277 @@
+module PageObject
+  module  ElementLocators
+    
+    #
+    # Finds a button
+    #
+    # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir only
+    #   * :value => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def button_element(identifier)
+      platform.button_for(identifier.clone)
+    end
+    
+    #
+    # Finds a text field
+    #
+    # @param [Hash] identifier how we find a text field.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :tag_name => Watir and Selenium
+    #   * :text => Watir only
+    #   * :value => Watir only
+    #   * :xpath => Watir and Selenium
+    #
+    def text_field_element(identifier)
+      platform.text_field_for(identifier.clone)
+    end
+    
+    #
+    # Finds a hidden field
+    #
+    # @param [Hash] identifier how we find a hidden field.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :tag_name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def hidden_field_element(identifier)
+      platform.hidden_field_for(identifier.clone)
+    end
+    
+    #
+    # Finds a text area
+    #
+    # @param [Hash] identifier how we find a text area.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :css => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :tag_name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def text_area_element(identifier)
+      platform.text_area_for(identifier.clone)
+    end
+    
+    #
+    # Finds a select list
+    #
+    # @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
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir only
+    #   * :value => Watir only
+    #   * :xpath => Watir and Selenium
+    #
+    def select_list_element(identifier)
+      platform.select_list_for(identifier.clone)
+    end
+    
+    #
+    # Finds a link
+    #
+    # @param [Hash] identifier how we find a link.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :href => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :link => Watir and Selenium
+    #   * :link_text => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def link_element(identifier)
+      platform.link_for(identifier.clone)
+    end
+    
+    #
+    # Finds a checkbox
+    #
+    # @param [Hash] identifier how we find a checkbox.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def checkbox_element(identifier)
+      platform.checkbox_for(identifier.clone)
+    end
+
+    #
+    # Finds a radio button
+    #
+    # @param [Hash] identifier how we find a radio button.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def radio_button_element(identifier)
+      platform.radio_button_for(identifier.clone)
+    end
+
+    #
+    # Finds a div
+    #
+    # @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
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def div_element(identifier)
+      platform.div_for(identifier.clone)
+    end
+
+    #
+    # Finds a span
+    #
+    # @param [Hash] identifier how we find a span.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def span_element(identifier)
+      platform.span_for(identifier.clone)
+    end
+    
+    #
+    # Finds a table
+    #
+    # @param [Hash] identifier how we find a table.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def table_element(identifier)
+      platform.table_for(identifier.clone)
+    end
+
+    #
+    # Finds a table cell
+    #
+    # @param [Hash] identifier how we find a cell.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir only
+    #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def cell_element(identifier)
+      platform.cell_for(identifier.clone)
+    end
+    
+    #
+    # Finds an image
+    #
+    # @param [Hash] identifier how we find an image.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def image_element(identifier)
+      platform.image_for(identifier.clone)
+    end
+    
+    #
+    # Finds a form
+    #
+    # @param [Hash] identifier how we find a form.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def form_element(identifier)
+      platform.form_for(identifier.clone)
+    end
+
+    #
+    # Finds a list item
+    #
+    # @param [Hash] identifier how we find a list item.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def list_item_element(identifier)
+      platform.list_item_for(identifier.clone)
+    end
+
+    #
+    # Finds an unordered list
+    #
+    # @param [Hash] identifier how we find an unordered list.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def unordered_list_element(identifier)
+      platform.unordered_list_for(identifier.clone)
+    end
+
+    #
+    #  Finds an ordered list
+    #
+    # @param [Hash] identifier how we find an ordered list.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def ordered_list_element(identifier)
+      platform.ordered_list_for(identifier.clone)
+    end
+  end
+end

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

@@ -93,14 +93,15 @@ module PageObject
         # platform method to handle attaching to a running window
         # See PageObject#attach_to_window
         #
-        def attach_to_window(identifier)
+        def attach_to_window(identifier, &block)
+          match = identifier.values.first
           handles = @browser.window_handles
           handles.each do |handle|
             @browser.switch_to.window handle
-            if identifier.keys.first == :title
-              return if @browser.title == identifier.values.first
-            elsif identifier.keys.first == :url
-              return if @browser.current_url == identifier.values.first
+            if identifier.keys.first == :title and @browser.title == match
+              return @browser.switch_to.window handle, &block
+            elsif identifier.keys.first == :url and @browser.current_url == match
+              return @browser.switch_to.window handle, &block
             end
           end
         end

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

@@ -83,9 +83,9 @@ module PageObject
     # platform method to handle attaching to a running window
     # See PageObject#attach_to_window
     #
-    def attach_to_window(identifier)
+    def attach_to_window(identifier, &block)
       win_id = {identifier.keys.first => /#{Regexp.escape(identifier.values.first)}/}
-      @browser.window(win_id).use
+      @browser.window(win_id).use &block
     end
     
     #

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

@@ -8,7 +8,7 @@ module PageObject
         # Set the value of the TextArea
         #
         def value=(new_value)
-          element.set(new_value)
+          element.send_keys(new_value)
         end
       end
     end

data/lib/page-object/version.rb

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

data/page-object.gemspec

@@ -19,8 +19,8 @@ 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.3.0'
-  s.add_dependency 'selenium-webdriver', '>= 2.3.2' 
+  s.add_dependency 'watir-webdriver', '>= 0.3.2'
+  s.add_dependency 'selenium-webdriver', '>= 2.4.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.0.0'

data/spec/page-object/element_locators_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+class ElementLocatorsTestPageObject
+  include PageObject
+end
+
+
+describe PageObject::ElementLocators do
+  let(:watir_browser) { mock_watir_browser }
+  let(:watir_page_object) { ElementLocatorsTestPageObject.new(watir_browser) }
+  
+  it "should find a button element" do
+    watir_browser.should_receive(:button).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.button_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Button
+  end
+  
+  it "should find a text field element" do
+    watir_browser.should_receive(:text_field).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.text_field_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::TextField
+  end
+  
+  it "should find a hidden field element" do
+    watir_browser.should_receive(:hidden).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.hidden_field_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::HiddenField
+  end
+  
+  it "should find a text area element" do
+    watir_browser.should_receive(:textarea).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.text_area_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::TextArea
+  end
+  
+  it "should find a select list element" do
+    watir_browser.should_receive(:select_list).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.select_list_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::SelectList
+  end
+  
+  it "should find a link element" do
+    watir_browser.should_receive(:link).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.link_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Link
+  end
+  
+  it "should find a check box" do
+    watir_browser.should_receive(:checkbox).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.checkbox_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::CheckBox
+  end
+  
+  it "should find a radio button" do
+    watir_browser.should_receive(:radio).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.radio_button_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::RadioButton
+  end
+  
+  it "should find a div" do
+    watir_browser.should_receive(:div).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.div_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Div
+  end
+  
+  it "should find a span" do
+    watir_browser.should_receive(:span).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.span_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Span
+  end
+  
+  it "should find a table" do
+    watir_browser.should_receive(:table).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.table_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Table
+  end
+  
+  it "should find a table cell" do
+    watir_browser.should_receive(:td).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.cell_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::TableCell
+  end
+  
+  it "should find an image" do
+    watir_browser.should_receive(:image).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.image_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Image
+  end
+  
+  it "should find a form" do
+    watir_browser.should_receive(:form).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.form_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::Form
+  end
+  
+  it "should find a list item" do
+    watir_browser.should_receive(:li).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.list_item_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::ListItem
+  end
+  
+  it "should find an unordered list" do
+    watir_browser.should_receive(:ul).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.unordered_list_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::UnorderedList
+  end
+  
+  it "should find an ordered list" do
+    watir_browser.should_receive(:ol).with(:id => 'blah').and_return(watir_browser)
+    element = watir_page_object.ordered_list_element(:id => 'blah')
+    element.should be_instance_of PageObject::Elements::OrderedList
+  end
+end