druid-ts 1.1.3 → 1.1.4

data/features/select_list.feature

@@ -65,3 +65,11 @@ Feature: Select List
   Scenario: It should know if an option is selected
     When I select "Test 2" from the select list
     Then the select list should know that "Test 2" is selected
+
+  Scenario: Clearing multiple select list
+    When I clear multiple select list
+    Then multiple select list should have no selected options
+
+  Scenario: Selecting an option by its value
+    When I select an option using the value "option2"
+    Then the selected option should be "Test 2"

data/features/span.feature

@@ -20,6 +20,8 @@ Feature: Span
     | index     |
     | name      |
     | text      |
+    | title     |
+    
   Scenario: Retrieve a Span
     When I retrieve a span element
     Then I should know it exists

data/features/step_definations/async_steps.rb

@@ -36,6 +36,9 @@ class AsyncPage
   button(:target, :value => 'Target')
   button(:hide, :value => 'Hide Button')
   button(:unhide, :value => 'Unhide Button')
+  button(:create_button, :value => "Create Button")
+  button(:remove_button, :value => "Remove Button")
+  button(:created_button, :value => "New Button")
 end
 
 Given(/^I am on the async elements page$/) do
@@ -61,3 +64,17 @@ Then(/^I should be able to wait until the button becomes invisible$/) do
     expect(@page.target_element.attribute("block")).to eql "none"
   end
 end
+
+When(/^I add a button a few seconds from now$/) do
+  @page.create_button
+end
+
+When(/^I remove a button a few seconds from now$/) do
+  @page.created_button_element.when_present
+  @page.remove_button
+end
+
+Then(/^I should not be able to find the button$/) do
+  @page.created_button_element.when_not_present
+  expect(@page.created_button_element.exist?).to be false
+end

data/features/step_definations/element_steps.rb

@@ -103,3 +103,9 @@ end
 When(/^I retrieve the label element$/) do
   @element = @page.label_id_element
 end
+
+Then(/^I should be able to flash it$/) do
+  sleep 5
+  @element.flash
+  sleep 5
+end

data/features/step_definations/multi_elements_steps.rb

@@ -306,3 +306,99 @@ end
 Then(/^the text for label (\d+) should be "([^"]*)"$/) do |label_num, text|
   expect(@elements[label_num.to_i - 1].text).to eql text
 end
+
+When(/^I select all buttons using no identifier$/) do
+  @elements = @page.button_elements
+end
+
+When(/^I select all text fields using no identifier$/) do
+  @elements = @page.text_field_elements
+end
+
+When(/^I select all hidden fields using no identifier$/) do
+  @elements = @page.hidden_field_elements
+end
+
+When(/^I select all text areas using no identifier$/) do
+  @elements = @page.text_area_elements
+end
+
+When(/^I select all select lists using no identifier$/) do
+  @elements = @page.select_list_elements
+end
+
+When(/^I select all links using no identifier$/) do
+  @elements = @page.link_elements
+end
+
+When(/^I select all checkboxes using no identifier$/) do
+  @elements = @page.checkboxes_elements
+end
+
+When(/^I select all radio buttons using no identifier$/) do
+  @elements = @page.radio_button_elements
+end
+
+When(/^I select all divs using no identifier$/) do
+  @elements = @page.div_elements
+end
+
+When(/^I select all spans using no identifier$/) do
+  @elements = @page.span_elements
+end
+
+When(/^I select all tables using no identifier$/) do
+  @elements = @page.table_elements
+end
+
+When(/^I select all cells using no identifier$/) do
+  @elements = @page.cell_elements
+end
+
+When(/^I select the images using no identifier$/) do
+  @elements = @page.image_elements
+end
+
+When(/^I select the forms using no identifier$/) do
+  @elements = @page.form_elements
+end
+
+When(/^I select all list items using no identifier$/) do
+  @elements = @page.list_item_elements
+end
+
+When(/^I select all unordered lists using no identifier$/) do
+  @elements = @page.unordered_list_elements
+end
+
+When(/^I select all ordered lists using no identifier$/) do
+  @elements = @page.ordered_list_elements
+end
+
+When /^I select all h(\d+)s using no identifier$/ do |num|
+  @elements = @page.send "h#{num}_elements"
+end
+
+When(/^I select all paragraphs using no identifier$/) do
+  @elements = @page.paragraph_elements
+end
+
+When(/^I select all labels using no identifier$/) do
+  @elements = @page.label_elements
+end
+
+When(/^I select the file fields with class "([^"]*)"$/) do |class_name|
+  @elements = @page.file_field_elements(:class => class_name)
+end
+
+Then(/^I should have (\d+) file fields$/) do |num_file_fields|
+  expect(@elements.size).to eql num_file_fields.to_i
+end
+
+Then(/^the title for file field (\d+) should be "([^"]*)"$/) do |file_field_num, title|
+  expect(@elements[file_field_num.to_i - 1].attribute('title')).to eql title
+end
+
+When(/^I select all file fields using no identifier$/) do
+  @elements = @page.file_field_elements
+end

data/features/step_definations/select_list_steps.rb

@@ -69,3 +69,15 @@ Then(/^the value for the option should be "([^"]*)"$/) do |value|
   @element = @page.send "select_list_#{@how}_element".to_sym
   expect(@element.value).to eql value
 end
+
+When(/^I clear multiple select list$/) do
+  @page.select_list_multiple_element.clear
+end
+
+Then(/^multiple select list should have no selected options$/) do
+  expect(@page.select_list_multiple_element.selected_options).to be_empty
+end
+
+When(/^I select an option using the value "([^"]*)"$/) do |value|
+  @page.select_list_id_element.select_value(value)
+end

data/features/step_definations/table_steps.rb

@@ -7,9 +7,10 @@ When(/^I retrieve a table element by "(.*?)"$/) do |how|
 end
 
 Then(/^the data for row "(.*?)" should be "(.*?)" and "(.*?)"$/) do |row, col1, col2|
-   row = @element[row.to_i - 1]
-   expect(row[0].text).to eql col1
-   expect(row[1].text).to eql col2
+   row = (row.to_i - 1) if row.to_i > 0
+   table_row = @element[row]
+   expect(table_row[0].text).to eql col1
+   expect(table_row[1].text).to eql col2
 end
 
 Then(/^the table should have "(.*?)" rows$/) do |number|
@@ -54,3 +55,19 @@ end
 Then(/^I should see that the table exists$/) do
   expect(@page.table_id?).to be true
 end
+
+Then(/^the data for column "([^"]*)" and row "([^"]*)" should be "([^"]*)"$/) do |column, row, value|
+  expect(@element[row.to_i - 1][column].text).to eql value
+end
+
+Then(/^the data for row "([^"]*)" and column "([^"]*)" should be "([^"]*)"$/) do |row, column, value|
+  expect(@element[row][column].text).to eql value
+end
+
+Then(/^the data for row "([^"]*)" should be nil$/) do |row|
+  expect(@element[row]).to be_nil
+end
+
+Then(/^the data for row "([^"]*)" and column "([^"]*)" should be nil$/) do |row, column|
+  expect(@element[row][column]).to be_nil
+end

data/features/support/ajax_test_environment.rb

@@ -1,4 +1,4 @@
-require_relative "../sample-app/sample_app"
+require File.dirname(__FILE__) + "/../sample-app/sample_app"
 
 class AjaxTestEnvironment
   def run

data/features/support/page.rb

@@ -16,6 +16,7 @@ class Page
   link(:google_search_link, :link => "Google Search")
   link(:google_search_link_text, :link_text => "Google Search")
   link(:google_search_css, :css => "a.link_class")
+  link(:google_search_title, :title => "link_title")
   link(:hello0, {:text => "Hello", :index => 0})
   link(:hello1, {:text => "Hello", :index => 1})
   link(:hello2, {:text => "Hello", :index => 2})
@@ -30,6 +31,7 @@ class Page
   text_field(:text_field_text, :text => "")
   text_field(:text_field_value, :value => "")
   text_field(:text_field_title, :title => "text_field_title")
+  text_field(:text_field_label, :label => "Text Field")
   text_field(:text_field_class_index, :class => "text_field_class", :index => 0)
   text_field(:text_field_name_index, :name => "text_field_name", :index => 0)
 
@@ -49,6 +51,7 @@ class Page
   select_list(:select_list_xpath, :xpath => "//select")
   select_list(:select_list_text, :text => "Test 1")
   select_list(:select_list_value, :value => "option1")
+  select_list(:select_list_multiple, :id => "sel_list_multiple")
   select_list(:select_list_class_index, :class => "sel_list_class", :index => 0)
   select_list(:select_list_name_index, :name => "sel_list_name", :index => 0)
 
@@ -94,6 +97,7 @@ class Page
   div(:div_index, :index => 0)
   div(:div_xpath, :xpath => '//div')
   div(:div_text, :text => "page-object rocks!")
+  div(:div_title, :title => "div_title")
   div(:div_class_index, :class => "div_class", :index => 0)
   div(:div_name_index, :name => "div_name", :index => 0)
 
@@ -120,6 +124,7 @@ class Page
   span(:span_xpath, :xpath => '//span')
   span(:span_name, :name => 'span_name')
   span(:span_text, :text => 'My alert')
+  span(:span_title, :title => 'span_title')
   span(:span_class_index, :class => "span_class", :index => 0)
   span(:span_name_index, :name => "span_name", :index => 0)
 
@@ -127,8 +132,8 @@ class Page
   label(:label_name, :name => "label_name")
   label(:label_class, :class => "label_class")
   label(:label_text, :text => "page-object is the best!")
-  label(:label_index, :index => 0)
-  label(:label_xpath, :xpath => "//label")
+  label(:label_index, :index => 1)
+  label(:label_xpath, :xpath => "//label[2]")
   label(:label_class_index, :class => "label_class", :index => 0)
   label(:label_name_index, :name => "label_name", :index => 0)
 

data/features/table.feature

@@ -10,6 +10,41 @@ Feature: Table
     Then I should know it is visible
     Then I should know it exists
 
+  Scenario: Retrieve data from a table using a row header
+    When I retrieve a table element
+    Then the data for row "Data3" should be "Data3" and "Data4"
+
+  Scenario: Retrieve data from a table using a partial row header
+    When I retrieve a table element
+    Then the data for row "ata3" should be "Data3" and "Data4"
+
+  Scenario: Retrieve data from a table using a row header in the 2nd column
+    When I retrieve a table element
+    Then the data for row "Data4" should be "Data3" and "Data4"
+
+  Scenario: Retrieve data from a table using a partial row header in the 2nd column
+    When I retrieve a table element
+    Then the data for row "ata4" should be "Data3" and "Data4"
+
+  Scenario: Retrieve data from a table using a column header
+    When I retrieve a table element
+    Then the data for column "Data2" and row "2" should be "Data4"
+
+  Scenario: Retrieve data from a table using a partial column header
+    When I retrieve a table element
+    Then the data for column "ata2" and row "2" should be "Data4"
+
+  Scenario: Retrieve data from a table using both headers
+    When I retrieve a table element
+    Then the data for row "Data3" and column "Data2" should be "Data4"
+
+  Scenario: Retrieve data from a table with an incorrect row header
+    When I retrieve a table element
+    Then the data for row "Data20" should be nil
+
+  Scenario: Retrieve data from a table with an incorrect column header
+    When I retrieve a table element
+    Then the data for row "Data3" and column "Data20" should be nil
   @name
   Scenario Outline: Locating table cells on the Page
     When I retrieve a table element by "<locate_by>"

data/features/text_area.feature

@@ -17,8 +17,6 @@ Feature: Text Area
     | class     |
     | name      |
     | xpath     |
-    | css       |
-    | tag_name  |
     | index     |
 
   @multi

data/features/text_field.feature

@@ -20,11 +20,10 @@ Feature: Text Fields
     | class     |
     | name      |
     | xpath     |
-    | css       |
-    | tag_name  |
     | index     |
     | text      |
     | title     |
+    | label     |
 
   Scenario: Retrieve a text field
     When I retrieve a text field

data/lib/druid.rb

@@ -52,8 +52,8 @@ module Druid
   def initialize(driver, visit=false)
     if driver.is_a? Watir::Browser
       @driver ||= driver
-      initialize_page if respond_to?(:initialize_page)
       goto if visit && respond_to?(:goto)
+      initialize_page if respond_to?(:initialize_page)
     else
       raise ArgumentError, "expect Watir::Browser"
     end
@@ -73,6 +73,34 @@ module Druid
     driver.goto url
   end
 
+  #
+  # Set the default timeout for page level Waits
+  #
+  def self.default_page_wait=(timeout)
+    @page_wait = timeout
+  end
+
+  #
+  # Return the default timeout for page level Waits
+  #
+  def self.default_page_wait
+    @page_wait ||= 30
+  end
+
+  #
+  # Sets the default timeout for element level Waits
+  #
+  def self.default_element_wait=(timeout)
+    @element_wait = timeout
+  end
+
+  #
+  # Returns the default timeout for element level Waits
+  #
+  def self.default_element_wait
+    @element_wait ||= 5
+  end
+
   #
   # Set the javascript framework to use when determining number of
   # ajax requests. Valid frameworks are :jquery, :prototype, and :Dojo
@@ -154,7 +182,7 @@ module Druid
   # @param [String] the message to include with the error if we exceed the timeout duration
   # @param block the block to execute. It should return true when successful.
   #
-  def wait_until(timeout = 30, message = nil, &block)
+  def wait_until(timeout = Druid.default_page_wait, message = nil, &block)
     driver.wait_until(timeout, message, &block)
   end
 
@@ -164,7 +192,7 @@ module Druid
   # @param [Numeric] the amount of time to wait for the block to return true.
   # @param [String] the message to include with the error if we exceed the timeout duration
   #
-  def wait_for_ajax(timeout = 30, message = nil)
+  def wait_for_ajax(timeout = Druid.default_page_wait, message = nil)
     end_time = ::Time.now + timeout
     until ::Time.now > end_time
       return if driver.execute_script(Druid::JavascriptFrameworkFacade.pending_requests) == 0

data/lib/druid/accessors.rb

@@ -1,10 +1,11 @@
 require 'druid/elements'
-#
-# Contains the class level methods that are inserted into your page class
-# when you include the PageObject module.  These methods will generate another
-# set of methods that provide access to the elements on the web pages.
-#
+
 module Druid
+  #
+  # Contains the class level methods that are inserted into your page class
+  # when you include the PageObject module.  These methods will generate another
+  # set of methods that provide access to the elements on the web pages.
+  #
   module Accessors
     #
     # Specify the url for the page.  A call to this method will generate a
@@ -34,7 +35,7 @@ module Druid
     #
     def expected_title(expected_title)
       define_method("has_expected_title?") do
-        has_expected_title = expected_title.kind_of?(Regexp) ? expected_title =~ title : expected_title == title
+        has_expected_title = expected_title === title
         raise "Expected title '#{expected_title}' instead of '#{title}'" unless has_expected_title
         has_expected_title
       end
@@ -58,7 +59,9 @@ module Druid
     end
 
     #
-    # Identify an element as existing within a frame or iframe.
+    # Identify an element as existing within a frame or iframe. A frame parameter
+    # is passed to the block and must be passed to the other calls to Druid.
+    # You can nest calls to in_frame by passing the frame to the next level.
     #
     # @example
     #  in_frame(:id => 'frame_id') do |frame|
@@ -69,6 +72,7 @@ module Druid
     #    * :id
     #    * :index
     #    * :name
+    # @param frame passed from a previous call to in_frame. Used to nest calls
     # @param block that contains the calls to elements that exist inside the frame.
     #
     def in_frame(identifier, frame=nil, &block)
@@ -77,7 +81,9 @@ module Druid
       block.call(frame)
     end
     #
-    # Identify an element as existing within a frame or iframe.
+    # Identify an element as existing within a frame or iframe. A frame parameter
+    # is passed to the block and must be passed to the other calls to Druid.
+    # You can nest calls to in_iframe by passing the frame to the next level.
     #
     # @example
     #  in_iframe(:id => 'frame_id') do |frame|
@@ -88,6 +94,7 @@ module Druid
     #    * :id
     #    * :index
     #    * :name
+    # @param frame passed from a previous call to in_iframe. Used to nest calls
     # @param block that contains the calls to elements that exist inside the frame.
     #
     def in_iframe(identifier, frame=nil, &block)
@@ -105,20 +112,23 @@ module Druid
     #   link(:add_to_cart, :text => "Add to Cart")
     #   # will generate 'add_to_cart', 'add_to_cart_element', and 'add_to_cart?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a link. The valid values are:
-    #   :class
-    #   :href
-    #   :id
-    #   :index
-    #   :name
-    #   :text
-    #   :xpath
-    #   :link
-    #   :link_text
-    #   :css
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a link. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
+    #   * :class
+    #   * :href
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :text
+    #   * :xpath
+    #   * :link
+    #   * :link_text
+    #   * :css
+    #   * :title
+    # @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 click_link_for identifier.clone unless block_given?
         self.send("#{name}_element").click
@@ -136,7 +146,7 @@ module Druid
     end
 
     #
-    # adds four methods to the page object - one to set text in a text field,
+    # adds four methods to the page objec - one to set text in a text field,
     # another to retrieve text from a text field, another to return the text
     # field element, another to check the text field's existence.
     #
@@ -145,18 +155,20 @@ module Druid
     #   # will generate 'first_name', 'first_name=', 'first_name_element',
     #   # 'first_name?' methods
     #
-    # @param  the name used for the generated methods
-    # @param identifier how we find a text_field.  The valid values are:
-    #   :class
-    #   :css
-    #   :id
-    #   :index
-    #   :name
-    #   :tag_name
-    #   :xpath
-    #   :text
-    #   :title
-    def text_field(name, identifier=nil, &block)
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a text_field. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #   * :text
+    #   * :title
+    #   * :label
+    # @param optional block to be invoked when element method is called
+    #
+    def text_field(name, identifier={:index => 0}, &block)
       define_method(name) do
         return text_field_value_for identifier.clone unless block_given?
         self.send("#{name}_element").value
@@ -188,16 +200,18 @@ module Druid
     #   # will generate 'check_active', 'uncheck_active', 'active_checked?',
     #   # 'active_element', and 'active?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a checkbox.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :name
-    #   :xpath
-    #   :value
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a checkbox. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #   * :value
+    # @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 check_checkbox identifier.clone unless block_given?
         self.send("#{name}_element").check
@@ -232,15 +246,17 @@ module Druid
     #   select_list(:state, :id => "state")
     #   # will generate 'state', 'state=', 'state_element', 'state?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a select_list.  The valid values are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a select_list.  You can use a multiple parameters
+    #  by combining of any of the following except xpath. The valid values are:
     #   :class
     #   :id
     #   :index
     #   :name
     #   :xpath
+    # @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 select_list_value_for identifier.clone unless block_given?
         self.send("#{name}_element").options.each {|o| return o.text if o.selected?}
@@ -273,16 +289,18 @@ module Druid
     #   # will generate 'select_north', 'clear_north', 'north_selected?',
     #   # 'north_element', and 'north?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a radio_button.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :name
-    #   :xpath
-    #   :value
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a radio_button. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #   * :value
+    # @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 select_radio identifier.clone unless block_given?
         self.send("#{name}_element").select
@@ -315,8 +333,9 @@ module Druid
     #   button(:purchase, :id => 'purchase')
     #   # will generate 'purchase', 'purchase_element', and 'purchase?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a button.  The valid values are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a button. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
     #   :class
     #   :id
     #   :index
@@ -326,8 +345,9 @@ module Druid
     #   :src
     #   :alt
     #   :css
+    # @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 click_button_for identifier.clone unless block_given?
         self.send("#{name}_element").click
@@ -352,17 +372,20 @@ module Druid
     #   div(:message, :id => 'message')
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a div.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :xpath
-    #   :name
-    #   :text
-    #   :value
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a div. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :xpath
+    #   * :name
+    #   * :text
+    #   * :value
+    #   * :title
+    # @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 div_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -388,14 +411,16 @@ module Druid
     #   # will generate a 'cart_element' and 'cart?' method
     #
     # @param the name used for the generated methods
-    # @param identifier how we find a table.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :xpath
-    #   :name
+    # @param identifier how we find a table. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :xpath
+    #   * :name
+    # @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?
         table_for(identifier.clone)
@@ -417,16 +442,18 @@ module Druid
     #   cell(:total, :id => 'total_cell')
     #   # will generate 'total', 'total_element', and 'total?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a cell.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :xpath
-    #   :name
-    #   :text
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a cell. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :xpath
+    #   * :name
+    #   * :text
+    # @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 cell_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -451,16 +478,18 @@ module Druid
     #   span(:alert, :id => 'alert')
     #   # will generate 'alert', 'alert_element', and 'alert?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a span.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :xpath
-    #   :name
-    #   :text
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a span. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :xpath
+    #   * :name
+    #   * :text
+    # @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 span_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -485,17 +514,19 @@ module Druid
     #   image(:logo, :id => 'logo')
     #   # will generate 'logo_element' and 'logo?' methods
     #
-    # @param the name used for the generated methods
-    # @param identifier how we find a image.  The valid values are:
-    #   :class
-    #   :id
-    #   :index
-    #   :name
-    #   :xpath
-    #   :alt
-    #   :src
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a image. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid values are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #   * :alt
+    #   * :src
+    # @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?
         image_for(identifier.clone)
@@ -516,16 +547,18 @@ module Druid
     #   form(:login, :id => 'login')
     #   # will generate 'login_element' and 'login?' methods
     #
-    # @param [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a form.  The valid keys are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a form. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #   * :action
+    # @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?
         form_for(identifier.clone)
@@ -547,19 +580,19 @@ module Druid
     #   hidden_field(:user_id, :id => "user_identity")
     #   # will generate 'user_id', 'user_id_element' and 'user_id?' methods
     #
-    # @param [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a hidden field.  The valid keys are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a hidden field. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class
-    #   * :css
     #   * :id
     #   * :index
     #   * :name
-    #   * :tag_name
     #   * :text
     #   * :xpath
     #   * :value
+    # @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}_element") do
         return call_block(&block) if block_given?
         hidden_field_for(identifier.clone)
@@ -585,15 +618,17 @@ module Druid
     #   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 [Hash] identifier how we find a list item.  The valid keys are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a list item. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
+    # @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 list_item_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -618,15 +653,17 @@ module Druid
     #   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 [Hash] identifier how we find an ordered list.  The valid keys are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find an ordered list. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
+    # @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?
         ordered_list_for(identifier.clone)
@@ -649,17 +686,17 @@ module Druid
     #   # will generate 'address', 'address=', 'address_element',
     #   # 'address?' methods
     #
-    # @param  [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a text area.  The valid keys are:
+    # @param  [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a text area. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class
-    #   * :css
     #   * :id
     #   * :index
     #   * :name
-    #   * :tag_name
     #   * :xpath
+    # @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 |value|
         return text_area_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
@@ -688,15 +725,16 @@ module Druid
     #   unordered_list(:menu, :id => 'main_menu')
     #   # will generate 'menu_element' and 'menu?' methods
     #
-    # @param [String] the name used for the generated methods
-    # @param [Hash] identifier how we find an unordered list.  The valid keys are:
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find an unordered list. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
-    #
-    def unordered_list(name, identifier=nil, &block)
+    # @param optional block to be invoked when element method is called
+    def unordered_list(name, identifier={:index => 0}, &block)
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         unordered_list_for(identifier.clone)
@@ -717,7 +755,7 @@ module Druid
     #   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
@@ -727,7 +765,7 @@ module Druid
     #   * :xpath
     # @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 h1_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -751,7 +789,7 @@ module Druid
     #   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
@@ -761,7 +799,7 @@ module Druid
     #   * :xpath
     # @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 h2_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -785,7 +823,7 @@ module Druid
     #   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
@@ -795,7 +833,7 @@ module Druid
     #   * :xpath
     # @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 h3_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -819,7 +857,7 @@ module Druid
     #   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
@@ -829,7 +867,7 @@ module Druid
     #   * :xpath
     # @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 h4_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -853,7 +891,7 @@ module Druid
     #   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
@@ -863,7 +901,7 @@ module Druid
     #   * :xpath
     # @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 h5_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -887,7 +925,7 @@ module Druid
     #   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
@@ -897,7 +935,7 @@ module Druid
     #   * :xpath
     # @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 h6_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -921,7 +959,7 @@ module Druid
     #   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
@@ -931,7 +969,7 @@ module Druid
     #   * :xpath
     # @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 paragraph_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -955,7 +993,7 @@ module Druid
     #   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
@@ -966,7 +1004,7 @@ module Druid
     #   * :xpath
     # @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 file_field_value_set(identifier.clone, value) unless block_given?
         self.send("#{name}_element").value = value
@@ -989,7 +1027,7 @@ module Druid
     #   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 parameters
     #  by combining of any of the following except xpath. The valid keys are:
     #  * :class
@@ -1000,7 +1038,7 @@ module Druid
     #  * :xpath
     # @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 label_text_for identifier.clone unless block_given?
         self.send("#{name}_element").text
@@ -1024,7 +1062,7 @@ module Druid
     #   element(:titile, :id => 'title')
     #   # will generate 'title'm '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 an element. You can use a multiple parameters
     # by combining of any of the following except xpath. The valid keys are:
     #   * :class
@@ -1034,7 +1072,7 @@ module Druid
     #   * :xpath
     # @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