page-object 0.6.4 → 0.6.5

data/features/text_area.feature

@@ -18,8 +18,6 @@ Feature: Text Area
     | class     |
     | name      |
     | xpath     |
-    | css       |
-    | tag_name  |
     | index     |
 
 
@@ -41,4 +39,4 @@ Feature: Text Area
     When I type "abcdefghijklmnop" into the text area
     Then the text area should contain "abcdefghijklmnop"
     When I clear the text area
-    Then the text area should contain ""
+    Then the text area should contain ""

data/features/text_field.feature

@@ -20,8 +20,6 @@ Feature: Text Fields
     | class     |
     | name      |
     | xpath     |
-    | css       |
-    | tag_name  |
     | index     |
     | title     |
 

data/lib/page-object/accessors.rb

@@ -97,18 +97,16 @@ module PageObject
     # @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
     #   * :title => Watir and Selenium
     #   * :value => Watir only
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def text_field(name, identifier=nil, &block)
+    def text_field(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.text_field_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -141,17 +139,15 @@ module PageObject
     # @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
     #   * :value => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def hidden_field(name, identifier=nil, &block)
+    def hidden_field(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.hidden_field_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -181,15 +177,13 @@ module PageObject
     # @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
     # @param optional block to be invoked when element method is called
     #
-    def text_area(name, identifier=nil, &block)
+    def text_area(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.text_area_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -219,7 +213,7 @@ module PageObject
     #   select_list(:state, :id => "state")
     #   # will generate 'state', 'state=', 'state_element', 'state?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -231,7 +225,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def select_list(name, identifier=nil, &block)
+    def select_list(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.select_list_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -260,7 +254,7 @@ module PageObject
     #   link(:add_to_cart, :text => "Add to Cart")
     #   # will generate 'add_to_cart', 'add_to_cart_element', and 'add_to_cart?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -275,7 +269,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def link(name, identifier=nil, &block)
+    def link(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.click_link_for identifier.clone unless block_given?
         self.send("#{name}_element").click
@@ -302,7 +296,7 @@ module PageObject
     #   # will generate 'check_active', 'uncheck_active', 'active_checked?', 
     #   # 'active_element', and 'active?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -313,7 +307,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def checkbox(name, identifier=nil, &block)
+    def checkbox(name, identifier={:index => 0}, &block)
       define_method("check_#{name}") do
         return platform.check_checkbox(identifier.clone) unless block_given?
         self.send("#{name}_element").check
@@ -349,7 +343,7 @@ module PageObject
     #   # will generate 'select_north', 'clear_north', 'north_selected?', 
     #   # 'north_element', and 'north?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -360,7 +354,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def radio_button(name, identifier=nil, &block)
+    def radio_button(name, identifier={:index => 0}, &block)
       define_method("select_#{name}") do
         return platform.select_radio(identifier.clone) unless block_given?
         self.send("#{name}_element").select
@@ -392,7 +386,7 @@ module PageObject
     #   button(:purchase, :id => 'purchase')
     #   # will generate 'purchase', 'purchase_element', and 'purchase?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -407,7 +401,7 @@ module PageObject
     #   * :alt => Watir and Selenium (input type=image only)
     # @param optional block to be invoked when element method is called
     #
-    def button(name, identifier=nil, &block)
+    def button(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.click_button_for identifier.clone unless block_given?
         self.send("#{name}_element").click
@@ -431,7 +425,7 @@ module PageObject
     #   div(:message, :id => 'message')
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -442,7 +436,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def div(name, identifier=nil, &block)
+    def div(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.div_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -466,7 +460,7 @@ module PageObject
     #   span(:alert, :id => 'alert')
     #   # will generate 'alert', 'alert_element', and 'alert?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -476,7 +470,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def span(name, identifier=nil, &block)
+    def span(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.span_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -501,7 +495,7 @@ module PageObject
     #   table(:cart, :id => 'shopping_cart')
     #   # will generate a 'cart_element' and 'cart?' method
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -511,7 +505,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def table(name, identifier=nil, &block)
+    def table(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.table_for(identifier.clone)
@@ -532,7 +526,7 @@ module PageObject
     #   cell(:total, :id => 'total_cell')
     #   # will generate 'total', 'total_element', and 'total?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -543,7 +537,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def cell(name, identifier=nil, &block)
+    def cell(name, identifier={:index => 0}, &block)
       define_method("#{name}") do
         return platform.cell_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -567,7 +561,7 @@ module PageObject
     #   image(:logo, :id => 'logo')
     #   # will generate 'logo_element' and 'logo?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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:
     #   * :alt => Watir and Selenium
@@ -579,7 +573,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def image(name, identifier=nil, &block)
+    def image(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.image_for(identifier.clone)
@@ -599,7 +593,7 @@ module PageObject
     #   form(:login, :id => 'login')
     #   # will generate 'login_element' and 'login?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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:
     #   * :action => Watir and Selenium
@@ -609,7 +603,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def form(name, identifier=nil, &block)
+    def form(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.form_for(identifier.clone)
@@ -630,7 +624,7 @@ module PageObject
     #   list_item(:item_one, :id => 'one')
     #   # will generate 'item_one', 'item_one_element', and 'item_one?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -640,7 +634,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def list_item(name, identifier=nil, &block)
+    def list_item(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.list_item_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -664,7 +658,7 @@ module PageObject
     #   unordered_list(:menu, :id => 'main_menu')
     #   # will generate 'menu_element' and 'menu?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -674,7 +668,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def unordered_list(name, identifier=nil, &block)
+    def unordered_list(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.unordered_list_for(identifier.clone)
@@ -694,7 +688,7 @@ module PageObject
     #   ordered_list(:top_five, :id => 'top')
     #   # will generate 'top_five_element' and 'top_five?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @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
@@ -704,7 +698,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def ordered_list(name, identifier=nil, &block)
+    def ordered_list(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         platform.ordered_list_for(identifier.clone)
@@ -724,7 +718,7 @@ module PageObject
     #   h1(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H1.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -734,7 +728,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h1(name, identifier=nil, &block)
+    def h1(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h1_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -758,7 +752,7 @@ module PageObject
     #   h2(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H2.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -768,7 +762,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h2(name, identifier=nil, &block)
+    def h2(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h2_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -792,7 +786,7 @@ module PageObject
     #   h3(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H3.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -802,7 +796,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h3(name, identifier=nil, &block)
+    def h3(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h3_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -826,7 +820,7 @@ module PageObject
     #   h4(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H4.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -836,7 +830,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h4(name, identifier=nil, &block)
+    def h4(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h4_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -860,7 +854,7 @@ module PageObject
     #   h5(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H5.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -870,7 +864,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h5(name, identifier=nil, &block)
+    def h5(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h5_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -894,7 +888,7 @@ module PageObject
     #   h6(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H6.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -904,7 +898,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def h6(name, identifier=nil, &block)
+    def h6(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.h6_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -928,7 +922,7 @@ module PageObject
     #   paragraph(:title, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a paragraph.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -938,7 +932,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def paragraph(name, identifier=nil, &block)
+    def paragraph(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.paragraph_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -962,7 +956,7 @@ module PageObject
     #   file_field(:the_file, :id => 'file_to_upload')
     #   # will generate 'the_file=', 'the_file_element', and 'the_file?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a file_field.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -973,7 +967,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def file_field(name, identifier=nil, &block)
+    def file_field(name, identifier={:index => 0}, &block)
       define_method("#{name}=") do |value|
         return platform.file_field_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
@@ -996,7 +990,7 @@ module PageObject
     #   label(:message, :id => 'message')
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a label.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -1007,7 +1001,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def label(name, identifier=nil, &block)
+    def label(name, identifier={:index => 0}, &block)
       define_method(name) do
         return platform.label_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -1028,10 +1022,11 @@ module PageObject
     # to retrieve an element, and another to check the element's existence.
     #
     # @example
-    #   element(:title, :id => 'title')
+    #   element(:title, :header, :id => 'title')
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
-    # @param [String] the name used for the generated methods
+    # @param [Symbol] the name used for the generated methods
+    # @param [Symbol] the name of the tag for the element
     # @param [Hash] identifier how we find an element.  You can use a multiple paramaters
     #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class => Watir and Selenium
@@ -1041,7 +1036,7 @@ module PageObject
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
-    def element(name, tag, identifier=nil, &block)
+    def element(name, tag, identifier={:index => 0}, &block)
       define_method("#{name}") do
         self.send("#{name}_element").text
       end