awetestlib 0.1.13 → 0.1.14

data/lib/awetestlib/regression/legacy.rb

@@ -1,42 +1,10 @@
 module Awetestlib
   module Regression
+    # Backward compatible methods and alias to support earlier versions of the Awetest DSL.
+    # These are deprecated in favor of the corresponding methods in the module name under which they are grouped.
+    # Work in Progress
     module Legacy
 
-      #--
-      ##def open_log
-      #  start = Time.now.to_f.to_s
-      #
-      #  logTS = Time.at(@myRun.launched.to_f).strftime("%Y%m%d%H%M%S")
-      #  xls = @myAppEnv.xls_name.gsub('.xls', '') + '_' if  @myAppEnv.xls_name.length > 0
-      #  @logFileSpec = "#{@myRoot}/#{logdir}/#{@myName}_#{@targetBrowser.abbrev}_#{xls}#{logTS}.log"
-      #  init_logger(@logFileSpec, @myName)
-      #
-      #                                                  #    message_tolog( self.inspect )
-      #  message_to_log("#{@myName} launched at [#{@myRun.launched.to_f.to_s}][#{@myScript.id}][#{@myRun.id}][#{@myChild.id}]")
-      #  debug_to_log("pid: #{$$}")
-      #  message_to_log("#{@myName} begin at [#{start}]")
-      #  message_to_log("#{@myName} environment [#{@myAppEnv.name}]")
-      #  message_to_log("#{@myName} xls_name [#{@myAppEnv.xls_name}]") if  @myAppEnv.xls_name.length > 0
-      #  message_to_log("#{@myName} rootDir [#{@myRoot}]")
-      #  message_to_log("#{@myName} Target Browser [#{@targetBrowser.name}]")
-      #  mark_testlevel(@myParent.name, @myParent.level) # Module
-      #  mark_testlevel(@myChild.name, @myChild.level) # SubModule
-      #
-      #end
-      #++
-
-      #def find_me(where, how, what)
-      #  me = where.element(how, what)
-      #  puts me.inspect
-      #rescue
-      #  error_to_log("#{where.inspect} doesn't seem to respond to element() #{$!}")
-      #end
-
-    #  def click_me(element)
-    #    element.click
-    #  rescue
-    #    error_to_log("#{element.inspect} doesn't seem to respond to click() #{$!}")
-    #  end
 
 
     end

data/lib/awetestlib/regression/page_data.rb

@@ -1,7 +1,11 @@
 module Awetestlib
   module Regression
+    # Methods for capture and manipulation of data contained in
+    # text, values, and/or states of spans, text fields, radios, checkboxes, and select_lists.
     module PageData
 
+      # @!group Core
+
 =begin rdoc
 :category: Page Data
 :tags: data, DOM, page
@@ -36,7 +40,7 @@ No positive validations are reported but failure is rescued and reported.
       end
 
       def compare_page_data(before, after, how, desc = '')
-        [:text, :textarea, :select_list, :span, :checkbox, :radio].each do |type|
+        [:text, :textarea, :select_list, :span, :hidden, :checkbox, :radio].each do |type|
           before[how][type].each_key do |what|
             msg = "#{desc} #{type} #{how}=#{what}: Expected '#{before[how][type][what]}'."
             if after[how][type][what] == before[how][type][what]
@@ -144,45 +148,42 @@ No positive validations are reported but failure is rescued and reported.
       end
 
       def get_textfield_value(browser, how, what, desc = '')
-        msg = "Return value in textfield #{how}='#{what}'"
-        msg << " #{desc}" if desc.length > 0
+        msg = build_message("Return value in textfield #{how}='#{what}'", desc)
         tf = browser.text_field(how, what)
-        if validate(browser, @myName, __LINE__)
-          if tf
-            debug_to_log("#{tf.inspect}")
-            vlu = tf.value
-            passed_to_log("#{msg} Value='#{vlu}'")
-            vlu
-          else
-            failed_to_log("#{msg}")
-          end
+        if tf
+          debug_to_log("#{tf.inspect}")
+          vlu = tf.value
+          passed_to_log("#{msg} Value='#{vlu}'")
+          vlu
+        else
+          failed_to_log("#{msg}")
         end
       rescue
         failed_to_log("Unable to #{msg}: '#{$!}'")
       end
 
-      def get_textfield_value_by_name(browser, strg, desc = '')
-        get_textfield_value(browser, :name, strg, desc)
-      end
-
-      def get_textfield_value_by_id(browser, strg)
-        get_textfield_value(browser, :id, strg)
-      end
-
       def get_element_text(browser, element, how, what, desc = '')
-        msg = "Return text in #{element} #{how}='#{what}'"
-        msg << " #{desc}" if desc.length > 0
+        msg = build_message("Return text in #{element} #{how}='#{what}'", desc)
         text = browser.element(how, what).text
-        if validate(browser, @myName, __LINE__)
-          passed_to_log("#{msg} text='#{text}'")
-          text
-        end
+        passed_to_log("#{msg} text='#{text}'")
+        text
       rescue
         failed_to_log("Unable to #{msg}: '#{$!}'")
       end
 
+      # @!endgroup Core
+
+      # @!group Legacy (Backward compatible usage)
+
+      def get_textfield_value_by_name(browser, strg, desc = '')
+        get_textfield_value(browser, :name, strg, desc)
+      end
 
+      def get_textfield_value_by_id(browser, strg)
+        get_textfield_value(browser, :id, strg)
+      end
 
+      # @!endgroup Legacy
 
     end
   end

data/lib/awetestlib/regression/runner.rb

@@ -6,6 +6,7 @@ require 'awetestlib/regression/tables'
 require 'awetestlib/regression/page_data'
 require 'awetestlib/regression/drag_and_drop'
 require 'awetestlib/regression/utilities'
+require 'awetestlib/regression/legacy'
 require 'awetestlib/logging'
 require 'awetestlib/regression/validations'
 require 'awetestlib/html_report'
@@ -20,6 +21,7 @@ module Awetestlib
 
     # order matters here
       include Awetestlib::Logging
+      include Awetestlib::Regression::Utilities
       include Awetestlib::Regression::Browser
       include Awetestlib::Regression::Find
       include Awetestlib::Regression::UserInput
@@ -27,8 +29,8 @@ module Awetestlib
       include Awetestlib::Regression::Tables
       include Awetestlib::Regression::PageData
       include Awetestlib::Regression::DragAndDrop
-      include Awetestlib::Regression::Utilities
       include Awetestlib::Regression::Validations
+      include Awetestlib::Regression::Legacy
 
       ::DEBUG   = 0
       ::INFO    = 1

data/lib/awetestlib/regression/tables.rb

@@ -1,7 +1,12 @@
 module Awetestlib
   module Regression
+    # Methods for handling Tables, Rows, and Cells
+    # Rdoc work in progress
     module Tables
 
+
+      # Groups: Columns, Rows, Sorting
+
       def get_index_for_column_head(panel, table_index, strg, desc = '')
         table = panel.tables[table_index]
         get_column_index(table, strg, desc, true)
@@ -241,6 +246,32 @@ module Awetestlib
         text
       end
 
+      # Return a hash containing a cross reference of the header names and indexes (columns) for the specified table.
+      # @example
+      #   (need example and usage)
+      # @param [Watir::Table] table A reference to the table.
+      # @param [Fixnum] header_index The index of the row containing the header names.
+      # @return [Hash] Two level hash of hashes. Internal hashes are 'name' which allows look-up of a column index
+      # by the header name, and 'index' which allows look-up of the name by the column index.
+      def get_table_headers(table, header_index = 1)
+        headers          = Hash.new
+        headers['index'] = Hash.new
+        headers['name']  = Hash.new
+        count            = 1
+        table[header_index].each do |cell|
+          if cell.text.length > 0
+            name                    = cell.text.gsub(/\s+/, ' ')
+            headers['index'][count] = name
+            headers['name'][name]   = count
+          end
+          count += 1
+        end
+        #debug_to_log("#{__method__}: headers:\n#{headers.to_yaml}")
+        headers
+      rescue
+        failed_to_log("Unable to get content headers. '#{$!}'")
+      end
+
       def count_rows_with_string(container, table_index, strg)
         hit = 0
         container.tables[table_index].each do |row|
@@ -510,6 +541,32 @@ module Awetestlib
         sleep_for(1)
       end
 
+      def text_in_table?(browser, how, what, expected, desc = '')
+        msg = build_message("Table :#{how}=>#{what} contains '#{expected}.", desc)
+        if browser.table(how, what).text =~ expected
+          passed_to_log(msg)
+          true
+        else
+          failed_to_log(msg)
+        end
+      rescue
+        failed_to_log("Unable to verify that #{msg}': '#{$!}'")
+      end
+
+      def text_in_table_row_with_text?(table, text, target, desc = '')
+        #TODO This needs clarification, renaming
+        msg   = build_message("Table :id=>#{table.id} row with text '#{text} also contains '#{target}.", desc)
+        index = get_index_of_row_with_text(table, text)
+        if table[index].text =~ target
+          passed_to_log(msg)
+          true
+        else
+          failed_to_log(msg)
+        end
+      end
+
+      alias verify_text_in_table_with_text text_in_table_row_with_text?
+
     end
   end
 end

data/lib/awetestlib/regression/user_input.rb

@@ -1,37 +1,37 @@
 module Awetestlib
+  # Awetest DSL for browser based testing.
   module Regression
+    # Methods covering user interactions with the browser.
+    #
+    #
+    # All of the methods in groups other than Core call Core methods.
+    # The methods in the other groups, along with aliases, exist for backward compatibility with earlier versions
+    # of the Awetest DSL.
     module UserInput
 
-=begin rdoc
-  :category: A_rdoc_test
-Click a specific DOM element by one of its attributes and that attribute's value.
-
-_Parameters_::
-
-*browser* - a reference to the browser window or container element to be tested
-
-*element* - the kind of element to click. Must be one of the elements recognized by Watir.
-Some common values are :link, :button, :image, :div, :span.
-
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
-
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-_Example_
-
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  click(browser, :link, :text, 'Pickaxe')
-
-=end
-
+      # @!group Core
+
+      # Click a specific DOM element identified by one of its attributes and that attribute's value.
+      #
+      # @example
+      #  # html for a link element:
+      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
+      #
+      #  click(browser, :link, :text, 'Pickaxe')
+      #
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] element The kind of element to click. Must be one of the elements recognized by Watir.
+      #   Some common values are :link, :button, :image, :div, :span.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return [Boolean] True if the Watir or Watir-webdriver function does not throw an exception.
+      #
       def click(browser, element, how, what, desc = '')
         #debug_to_log("#{__method__}: #{element}, #{how}, #{what}")
-        msg = "Click #{element} :#{how}=>'#{what}'"
-        msg << ", '#{desc}'" if desc.length > 0
+        msg = build_message("Click #{element} :#{how}=>'#{what}'", desc)
         msg1 = "#{element}(#{how}, '#{what}')"
         begin
           case element
@@ -58,46 +58,207 @@ _Example_
               browser.element(how, what).click
           end
         end
-        if validate(browser, @myName, __LINE__)
           passed_to_log(msg)
           true
-        end
       rescue
         failed_to_log("Unable to #{msg}. '#{$!}'")
       end
 
-=begin rdoc
-  :category: A_rdoc_test
-Click a specific DOM element by one of its attributes and that attribute's value and
-do not wait for the browser to finish reloading.  Used when a modal popup or alert is expected. Allows the script
-to keep running so the popup can be handled.
+      # @!endgroup Core
+
+      # @!group Click
+
+      # Click a button element identified by the value of its *:id* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param [Watir::Browser, Watir::Container] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def click_button_by_id(browser, what, desc = '')
+        click(browser, :button, :id, what, desc)
+      end
+
+      # Click a button element identified by the value of its index within the container referred to by <b>*browser*</b>.
+      # @param [Watir::Browser, Watir::Container] browser A reference to the browser window or container element to be tested.
+      # @param [Fixnum] what An integer that indicates the index of the element within the container.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def click_link_by_index(browser, what, desc = '')
+        click(browser, :link, :index, what, desc)
+      end
+
+      # Click a link element identified by the value of its *:href* attribute. Take care to escape characters in the url that are reserved by Regexp.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_href(browser, what, desc = '')
+        click(browser, :link, :href, what, desc)
+      end
+
+      alias click_href click_link_by_href
+
+      # Click a link element identified by the value of its *:href* attribute and do not wait for the browser to reach ready state.
+      # Take care to escape characters in the url that are reserved by Regexp.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_no_wait_by_href(browser, what, desc = '')
+        click_no_wait(browser, :link, :href, what, desc)
+      end
+
+      # Click a button element identified by the value of its index within the container referred to by <b>*browser*</b>.
+      # @param (see #click_link_by_index)
+      # @return (see #click)
+      def click_button_by_index(browser, what, desc = '')
+        click(browser, :button, :index, what, desc)
+      end
+
+      # Click a button element identified by the value of its *:name* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_name(browser, what, desc = '')
+        click(browser, :button, :name, what, desc)
+      end
+
+      # Click a button element identified by the value of its *:text* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_text(browser, what, desc = '')
+        click(browser, :button, :text, what, desc)
+      end
+
+      # Click a button element identified by the value of its *:class* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_class(browser, what, desc = '')
+        click(browser, :button, :class, what, desc)
+      end
+
+      # Click a button element identified by the value of its *:value* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_value(browser, what, desc = '')
+        click(browser, :button, :value, what, desc)
+      end
 
-_Parameters_::
+      # Click a button element identified by the value of its *:title* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_title(browser, what, desc = '')
+        click(browser, :button, :title, what, desc)
+      end
 
-*browser* - a reference to the browser window to be tested
+      # Click a link element identified by the value of its *:id* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_id(browser, what, desc = '')
+        click(browser, :link, :id, what, desc)
+      end
 
-*element* - the kind of element to click. Must be one of the elements recognized by Watir.
-Some common values are :link, :button, :image, :div, :span.
+      alias click_id click_link_by_id
 
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # Click a link element identified by the value of its *:name* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_name(browser, what, desc = '')
+        click(browser, :link, :name, what, desc)
+      end
 
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      alias click_name click_link_by_name
 
-*desc* - a string containing a message or description intended to appear in the log and/or report output
+      # Click a file_field element identified by the value of its *:id* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_file_field_by_id(browser, what, desc = '')
+        click(browser, :file_field, :id, what, desc)
+      end
+
+      # Click an image element identified by the value of its *:id* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_img_by_alt(browser, what, desc = '')
+        click(browser, :image, :alt, what, desc)
+      end
+
+      # Click an image element identified by the value of its *:title* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_img_by_title(browser, what, desc = '')
+        click(browser, :image, :title, what, desc)
+      end
+
+      # Click an image element identified by the value of its *:src* attribute.
+      # Take care to escape characters in the source url that are reserved by Regexp.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_img_by_src(browser, what, desc = '')
+        click(browser, :image, :src, what, desc)
+      end
+
+      # Click a link element identified by the value of its *:value* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_value(browser, what, desc = '')
+        click(browser, :link, :value, what, desc)
+      end
+
+      # Click a link element identified by the value in its text (innerHTML).
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_text(browser, what, desc = '')
+        click(browser, :link, :text, what, desc)
+      end
+
+      alias click_link click_link_by_text
+      alias click_text click_link_by_text
+      alias click_js_button click_link_by_text
+
+      # Click a link element identified by the value of its *:class* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_class(browser, what, desc = '')
+        click(browser, :link, :class, what, desc)
+      end
+
+      alias click_class click_link_by_class
+
+      # Click a span element identified by the value in its text (innerHTML).
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_span_by_text(browser, what, desc = '')
+        click(browser, :span, :text, what)
+      end
 
-_Example_
+      alias click_span_with_text click_span_by_text
 
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  click_no_wait(browser, :link, :text, 'Pickaxe')
+      # Click a link element identified by the value of its *:title* attribute.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_title(browser, what, desc = '')
+        click(browser, :link, :title, what, desc)
+      end
 
-=end
+      alias click_title click_link_by_title
 
+      # @!endgroup Click
+
+      # @!group Core
+
+      # Click a specific DOM element by one of its attributes and that attribute's value and
+      # do not wait for the browser to finish reloading.  Used when a modal popup or alert is expected. Allows the script
+      # to keep running so the popup can be handled.
+      #
+      # @example
+      #  # html for a link element:
+      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
+      #
+      #  click_no_wait(browser, :link, :text, 'Pickaxe')
+      #
+      # @see #click
+      #
+      # @param (see #click)
+      # @return (see #click)
+      #
       def click_no_wait(browser, element, how, what, desc = '')
         debug_to_log("#{__method__}: #{element}, #{how}, #{what}")
-        msg = "Click no wait #{element} :#{how}=>'#{what}'"
-        msg << ", '#{desc}'" if desc.length > 0
+        msg = build_message("Click no wait #{element} :#{how}=>'#{what}'", desc)
         msg1 = "#{element}(#{how}, '#{what}'"
         begin
           case element
@@ -130,151 +291,53 @@ _Example_
             raise e
           end
         end
-        if validate(browser, @myName, __LINE__)
           passed_to_log(msg)
           true
-        end
       rescue
         failed_to_log("Unable to #{msg}  '#{$!}'")
         sleep_for(1)
       end
 
-    # :category: User Input
-      def click_button_by_id(browser, strg, desc = '')
-        click(browser, :button, :id, strg, desc)
-      end
-
-    # :category: User Input
-      def click_link_by_index(browser, strg, desc = '')
-        click(browser, :link, :index, strg, desc)
-      end
-
-    # :category: User Input
-      def click_link_by_href(browser, strg, desc = '')
-        click(browser, :link, :href, strg, desc)
-      end
-
-      alias click_href click_link_by_href
-    # :category: User Input
-      def click_link_no_wait_by_href(browser, strg, desc = '')
-        click_no_wait(browser, :link, :href, strg, desc)
-      end
+      # @!endgroup Core
 
       alias click_href_no_wait click_link_no_wait_by_href
-    # :category: User Input
-      def click_button_by_index(browser, index, desc = '')
-        click(browser, :button, :index, index, desc)
-      end
 
-    # :category: User Input
-      def click_button_by_name(browser, strg, desc = '')
-        click(browser, :button, :name, strg, desc)
-      end
-
-    # :category: User Input
-      def click_button_by_text(browser, strg, desc = '')
-        click(browser, :button, :text, strg, desc)
-      end
+      # @!group Click No Wait
 
-    # :category: User Input
-      def click_button_by_class(browser, strg, desc = '')
-        click(browser, :button, :class, strg, desc)
-      end
-
-    # :category: User Input
-      def click_button_no_wait_by_id(browser, strg, desc = '')
-        click_no_wait(browser, :button, :id, strg, desc)
+      # Click a button element identified by the value of its *:id* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_no_wait_by_id(browser, what, desc = '')
+        click_no_wait(browser, :button, :id, what, desc)
       end
 
       alias click_button_by_id_no_wait click_button_no_wait_by_id
-    # :category: User Input
-      def click_button_no_wait_by_name(browser, strg, desc = '')
-        click_no_wait(browser, :button, :name, strg, desc)
-      end
-
-    # :category: User Input
-      def click_button_no_wait_by_class(browser, strg, desc = '')
-        click_no_wait(browser, :button, :class, strg, desc)
-      end
-
-      alias click_button_by_class_no_wait click_button_no_wait_by_class
-    # :category: User Input
-      def click_button_by_value(browser, strg, desc = '')
-        click(browser, :button, :value, strg, desc)
-      end
-
-    # :category: User Input
-      def click_button_by_title(browser, strg, desc = '')
-        click(browser, :button, :title, strg, desc)
-      end
-
-    # :category: User Input
-      def click_button_by_xpath_and_id(browser, strg, desc = '')
-        msg = "Click button by xpath and id '#{strg}' #{desc}"
-        if browser.button(:xpath, "//a[@id = '#{strg}']").click
-          passed_to_log(msg)
-          true
-        else
-          failed_to_log(msg)
-        end
-      rescue
-        failed_to_log("Unable to click button by xpath and id '#{strg}' #{desc} '#{$!}' (#{__LINE__})")
-      end
-
-      alias click_button_by_xpath click_button_by_xpath_and_id
-
-=begin rdoc
-  :category: A_rdoc_test
-Click a link identified by the value in its id attribute.  Calls click()
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
 
-*strg* - a string or a regular expression to be found in the id  attribute that uniquely identifies the element.
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-
-_Example_
-
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  click_link_by_text(browser, 'Pickaxe', 'Open the page for the Pickaxe book')
-
-=end
-
-      def click_link_by_id(browser, strg, desc = '')
-        click(browser, :link, :id, strg, desc)
+      # Click a button element identified by the value of its *:name* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_no_wait_by_name(browser, what, desc = '')
+        click_no_wait(browser, :button, :name, what, desc)
       end
 
-    # :category: A_rdoc_test
-      alias click_id click_link_by_id
-
-    # :category: User Input
-      def click_link_by_name(browser, strg, desc = '')
-        click(browser, :link, :name, strg, desc)
-      end
-
-      alias click_name click_link_by_name
-    # :category: User Input
-      def click_link_by_xpath_and_id(browser, strg, desc = '')
-        msg = "Click link by xpath and id '#{strg}' #{desc}"
-        if browser.link(:xpath, "//a[@id = '#{strg}']").click
-          passed_to_log(msg)
-          true
-        else
-          failed_to_log(msg)
-        end
-      rescue
-        failed_to_log("Unable click on link by xpath and id '#{strg}' #{desc} '#{$!}' (#{__LINE__})")
+      # Click a button element identified by the value of its *:class* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_no_wait_by_class(browser, what, desc = '')
+        click_no_wait(browser, :button, :class, what, desc)
       end
 
-      alias click_link_by_xpath click_link_by_xpath_and_id
+      alias click_button_by_class_no_wait click_button_no_wait_by_class
 
-    # :category: User Input
-      def click_link_no_wait_by_id(browser, strg, desc = '')
-        click_no_wait(browser, :link, :id, strg, desc)
+      # Click a link element identified by the value of its *:id* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_no_wait_by_id(browser, what, desc = '')
+        click_no_wait(browser, :link, :id, what, desc)
       end
 
       alias click_no_wait_id click_link_no_wait_by_id
@@ -282,266 +345,241 @@ _Example_
       alias click_id_no_wait click_link_no_wait_by_id
       alias click_no_wait_link_by_id click_link_no_wait_by_id
 
-    # :category: User Input
-      def click_file_field_by_id(browser, strg, desc = '')
-        click(browser, :file_field, :id, strg, desc)
-      end
-
-    # :category: User Input
-      def click_img_by_alt(browser, strg, desc = '')
-        click(browser, :image, :alt, strg, desc)
-      end
-
-    # :category: User Input
-      def click_img_by_title(browser, strg, desc = '')
-        click(browser, :image, :title, strg, desc)
-      end
-
-    # :category: User Input
-      def click_img_by_xpath_and_name(browser, strg, desc = '')
-        msg = "Click image by xpath where name='#{strg}' #{desc}"
-        if browser.link(:xpath, "//input[@name = '#{strg}']").click
-          passed_to_log(msg)
-          true
-        else
-          failed_to_log(msg)
-        end
-      rescue
-        failed_to_log("Unable to click image by xpath where name='#{strg}' #{desc} '#{$!}'")
-      end
-
-      alias click_img_by_xpath click_img_by_xpath_and_name
-      alias click_image_by_xpath click_img_by_xpath_and_name
-      alias click_image_by_xpath_and_name click_img_by_xpath_and_name
-
-    # :category: User Input
-      def click_img_no_wait_by_alt(browser, strg, desc = '')
-        click_no_wait(browser, :image, :alt, strg, desc)
+      # Click an image element identified by the value of its *:alt* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_img_no_wait_by_alt(browser, what, desc = '')
+        click_no_wait(browser, :image, :alt, what, desc)
       end
 
       alias click_img_by_alt_no_wait click_img_no_wait_by_alt
-    # :category: User Input
-      def click_img_by_src(browser, strg, desc = '')
-        click(browser, :image, :src, strg, desc)
-      end
 
-    # :category: User Input
-      def click_img_by_src_and_index(browser, strg, index, desc = '')
-        msg = "Click image by src='#{strg}' and index=#{index}"
-        msg << " #{desc}" if desc.length > 0
-        browser.image(:src => strg, :index => index).click
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("Unable to #{msg} '#{$!}'")
+      # Click a button element identified by the value in its text (innerHTML)
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_no_wait_by_text(browser, what, desc = '')
+        click_no_wait(browser, :button, :text, what, desc)
       end
 
-    # :category: User Input
-      def click_link_by_value(browser, strg, desc = '')
-        click(browser, :link, :value, strg, desc)
+      # Click a button element identified by the value of its *:value* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_no_wait_by_value(browser, what, desc = '')
+        click_no_wait(browser, :button, :value, what, desc)
       end
 
-=begin rdoc
-  :category: A_rdoc_test
-Click a link identified by the value in its text attribute.  Calls click()
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*strg* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-
-_Example_
-
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  click_link_by_text(browser, 'Pickaxe', 'Open the page for the Pickaxe book')
-
-=end
-
-      def click_link_by_text(browser, strg, desc = '')
-        click(browser, :link, :text, strg, desc)
+      # Click a button element identified by the value of its *:name* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_name_no_wait(browser, what, desc = '')
+        click_no_wait(browser, :link, :name, what, desc)
       end
 
-      alias click_link click_link_by_text
-    # :category: A_rdoc_test
-      alias click_text click_link_by_text
-      alias click_js_button click_link_by_text
+      alias click_no_wait_name click_link_by_name_no_wait
+      alias click_name_no_wait click_link_by_name_no_wait
 
-    # :category: User Input
-      def click_link_by_class(browser, strg, desc = '')
-        click(browser, :link, :class, strg, desc)
+      # Click a link element identified by the value in its text (innerHTML)
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_text_no_wait(browser, what, desc = '')
+        click_no_wait(browser, :link, :text, what, desc)
       end
 
-      alias click_class click_link_by_class
+      alias click_no_wait_text click_link_by_text_no_wait
+      alias click_text_no_wait click_link_by_text_no_wait
 
-    # :category: User Input
-      def click_button_no_wait_by_text(browser, strg, desc = '')
-        click_no_wait(browser, :button, :text, strg, desc)
+      # Click a link element identified by the value of its *:title* attribute
+      # and do not wait for the browser to reach ready state.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_title_no_wait(browser, what, desc = '')
+        click_no_wait(browser, :link, :title, what, desc)
       end
 
-    # :category: User Input
-      def click_button_no_wait_by_value(browser, strg, desc = '')
-        click_no_wait(browser, :button, :value, strg, desc)
-      end
+      # @!endgroup Click No Wait
 
-    # :category: User Input
-      def click_link_by_name_no_wait(browser, strg, desc = '')
-        click_no_wait(browser, :link, :name, strg, desc)
+      # @!group Xpath
+
+      # Click a button element identified by the value of its *:id* attribute using the xpath functionality in Watir.
+      # A button is an HTML element with tag 'input' and type 'submit' or 'button'.
+      # @note Normally used only when the element is not located by other methods.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_button_by_xpath_and_id(browser, what, desc = '')
+        click(browser, :button, :xpath, "//a[@id = '#{what}']", desc)
       end
 
-      alias click_no_wait_name click_link_by_name_no_wait
-      alias click_name_no_wait click_link_by_name_no_wait
+      alias click_button_by_xpath click_button_by_xpath_and_id
 
-    # :category: User Input
-      def click_link_by_text_no_wait(browser, strg, desc = '')
-        click_no_wait(browser, :link, :text, strg, desc)
+      # Click a link element identified by the value of its *:id* attribute using the xpath functionality in Watir.
+      # @note Normally used only when the element is not located by other methods.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_link_by_xpath_and_id(browser, what, desc = '')
+        click(browser, :link, :xpath, "//a[@id = '#{what}']", desc)
       end
 
-      alias click_no_wait_text click_link_by_text_no_wait
-      alias click_text_no_wait click_link_by_text_no_wait
+      alias click_link_by_xpath click_link_by_xpath_and_id
 
-    # :category: User Input
-      def click_span_by_text(browser, strg, desc = '')
-        if not desc and not strg.match(/Save|Open|Close|Submit|Cancel/)
-          desc = 'to navigate to selection'
-        end
-        msg = "Click span containing text '#{strg}'."
-        msg << " #{desc}" if desc.length > 0
-        if validate(browser, @myName, __LINE__)
-          passed_to_log("#{msg}")
-        end
-      rescue
-        failed_to_log("Unable to #{msg}: '#{$!}'")
+      # Click an image element identified by the value of its *:name* attribute using the xpath functionality in Watir.
+      # @note Normally used only when the element is not located by other methods.
+      # @param (see #click_button_by_id)
+      # @return (see #click)
+      def click_img_by_xpath_and_name(browser, what, desc = '')
+        click(browser, :image, :xpath, "//a[@id = '#{what}']", desc)
       end
 
-    # TODO no logging yet.  slow.# :category: User Input
-      def click_span_with_text(browser, trgt, desc = '')
-        msg = "Find and click span containing text '#{trgt}'."
-        msg << " #{desc}" if desc.length > 0
-        spans = browser.spans
-        x     = 0
-        spans.each do |span|
-          x += 1
-          debug_to_log("Span #{x}: #{span.text}")
-          aText = span.text
-          if aText and aText.size > 0
-            if aText =~ /#{trgt}/
-              break
-            end
-          end
-        end
-        spans[x].click
-      end
+      alias click_img_by_xpath click_img_by_xpath_and_name
+      alias click_image_by_xpath click_img_by_xpath_and_name
+      alias click_image_by_xpath_and_name click_img_by_xpath_and_name
 
-    # :category: User Input
-      def click_link_by_title(browser, strg, desc = '')
-        click(browser, :link, :title, strg, desc)
-      end
+      # @!endgroup Xpath
 
-      alias click_title click_link_by_title
-    # :category: User Input
-      def click_title_no_wait(browser, strg, desc = '')
-        click_no_wait(browser, :link, :title, strg, desc)
-      end
+      # @!group Core
 
-    # :category: User Input
-      def click_table_row_with_text_by_id(browser, ptrn, strg, column = nil)
-        msg   = "id=#{ptrn} row with text='#{strg}"
-        table = get_table_by_id(browser, /#{ptrn}/)
-        if table
-          index = get_index_of_row_with_text(table, strg, column)
-          if index
-            table[index].click
-            if validate(browser, @myName, __LINE__)
-              passed_to_log("Click #{msg} row index=#{index}.")
-              index
-            end
-          else
-            failed_to_log("Table #{msg} not found to click.")
-          end
-        else
-          failed_to_log("Table id=#{ptrn} not found.")
-        end
+      # Click an image element identified by the value of its *:src* attribute and its index
+      # within the array of image elements with src containing <b>*what*</b> and
+      # within the container referred to by <b>*browser*</b>.
+      # @param [Watir::Browser, Watir::Container] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [Fixnum] index An integer that indicates the index of the element within the array of image elements with src containing <b>*what*</b>.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def click_img_by_src_and_index(browser, what, index, desc = '')
+        msg = "Click image by src='#{what}' and index=#{index}"
+        msg << " #{desc}" if desc.length > 0
+        browser.image(:src => what, :index => index).click
+          passed_to_log(msg)
+          true
       rescue
-        failed_to_log("Unable to click table #{msg}: '#{$!}' (#{__LINE__}) ")
+        failed_to_log("Unable to #{msg} '#{$!}'")
       end
 
-    # :category: User Input
-      def click_table_row_with_text_by_index(browser, idx, strg, column = nil)
-        msg   = "index=#{idx} row with text='#{strg}"
-        table = get_table_by_index(browser, idx)
+      # Click the first row which contains a particular string in a table identified by attribute and value.
+      # A specific column in the table can also be specified.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @param [String] text Full text string to be found in the table row.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Fixnum] column Integer indicating the column to search for the text string.
+      # If not supplied all columns will be checked.
+      # @return (see #click)
+      #
+      def click_table_row_with_text(browser, how, what, text, desc = '', column = nil)
+        msg = build_message("Click row with text #{text} in table :#{how}=>'#{what}.", desc)
+        table = get_table(browser, how, what, desc)
         if table
-          index = get_index_of_row_with_text(table, strg, column)
+          index = get_index_of_row_with_text(table, text, column)
           if index
             table[index].click
-            if validate(browser, @myName, __LINE__)
-              passed_to_log("Click #{msg} row index=#{index}.")
+              passed_to_log(msg)
               index
-            end
           else
-            failed_to_log("Table #{msg} not found to click.")
+            failed_to_log("#{msg} Row not found.")
           end
         else
-          failed_to_log("Table id=#{ptrn} not found.")
+          failed_to_log("#{msg} Table not found.")
         end
       rescue
-        failed_to_log("Unable to click table #{msg}: '#{$!}' (#{__LINE__}) ")
-      end
-
-      def double_click_table_row_with_text_by_id(browser, ptrn, strg, column = nil)
-        msg   = "id=#{ptrn} row with text='#{strg}"
-        table = get_table_by_id(browser, /#{ptrn}/)
-        if table
-          index = get_index_of_row_with_text(table, strg, column)
-          if index
-            table[index].fire_event('ondblclick')
-            if validate(browser, @myName, __LINE__)
-              passed_to_log("Double click #{msg} row index=#{index}.")
-              index
-            end
-          else
-            failed_to_log("Table #{msg} not found to double click.")
-          end
-        else
-          failed_to_log("Table id=#{ptrn} not found.")
-        end
-      rescue
-        failed_to_log("Unable to double click table #{msg}: '#{$!}' (#{__LINE__}) ")
+        failed_to_log("Unable to #{msg}: '#{$!}'")
       end
 
-      def double_click_table_row_with_text_by_index(browser, idx, strg, column = nil)
-        msg   = "index=#{idx} row with text='#{strg}"
-        table = get_table_by_index(browser, idx)
+      # Double click the first row which contains a particular string in a table identified by attribute and value.
+      # A specific column in the table can also be specified.
+      # Uses fire_event method in Watir to send 'onDblClick' event.
+      # @param (see #click_table_row_with_text)
+      # @return (see #click)
+      #
+      def double_click_table_row_with_text(browser, how, what, text, desc = '', column = nil)
+        msg = build_message("Double click row with text #{text} in table :#{how}=>'#{what}.", desc)
+        table = get_table(browser, how, what, desc)
         if table
-          index = get_index_of_row_with_text(table, strg, column)
+          index = get_index_of_row_with_text(table, text, column)
           if index
-            row = table[index]
             table[index].fire_event('ondblclick')
-            row.fire_event('ondblclick')
-            if validate(browser, @myName, __LINE__)
-              passed_to_log("Double click #{msg} row index=#{index}.")
+              passed_to_log(msg)
               index
-            end
           else
-            failed_to_log("Table #{msg} not found to double click.")
+            failed_to_log("#{msg} Row not found.")
           end
         else
-          failed_to_log("Table id=#{ptrn} not found.")
+          failed_to_log("#{msg} Table not found.")
         end
       rescue
-        failed_to_log("Unable to double click table #{msg}: '#{$!}' (#{__LINE__}) ")
+        failed_to_log("Unable to #{msg}: '#{$!}'")
       end
 
-      def click_popup_button(title, button, waitTime= 9, user_input=nil)
+      # @!endgroup Core
+
+      # @!group Tables
+
+      # Click the first row which contains a particular string in a table identified by the value in its *:id* attribute.
+      #
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @param [String] text Full text string to be found in the table row.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Fixnum] column Integer indicating the column to search for the text string.
+      # If not supplied all columns will be checked.
+      # @return (see #click)
+      #
+      def click_table_row_with_text_by_id(browser, what, text, desc = '', column = nil)
+        click_table_row_with_text(browser, :id, what, text, desc, column)
+      end
+
+      # Click the first row which contains a particular string in a table identified by its index
+      # in the array of tables contained in <b>*browser*</b>.
+      # A specific column in the table can also be specified.
+      #
+      # @param (see #click_table_row_with_text_by_id)
+      # @return (see #click)
+      #
+      def click_table_row_with_text_by_index(browser, what, text, desc = '', column = nil)
+        click_table_row_with_text(browser, :id, what, text, desc, column)
+      end
+
+      # Double click the first row which contains a particular string in a table identified by the value in its *:id* attribute.
+      # A specific column in the table can also be specified.
+      #
+      # @param (see #click_table_row_with_text_by_id)
+      # @return (see #click)
+      #
+      def double_click_table_row_with_text_by_id(browser, what, text, desc = '', column = nil)
+        double_click_table_row_with_text(browser, :id, what, text, desc, column)
+      end
+
+      # Double click the first row which contains a particular string in a table identified by its index
+      # in the array of tables contained in <b>*browser*</b>.
+      # A specific column in the table can also be specified.
+      # @param (see #click_table_row_with_text_by_id)
+      # @return (see #click)
+      #
+      def double_click_table_row_with_text_by_index(browser, idx, what, column = nil)
+        double_click_table_row_with_text(browser, :index, what, text, desc, column)
+      end
+
+      # @!endgroup Tables
+
+      # @!group Core
+
+      # Click a specifific button on a popup window.
+      # (Windows only)
+      # @param [String] title A string starting at the beginning of the title which uniquely identifies the popup window.
+      # @param [String] button The value displayed for the button (e.g. OK, Yes, Cancel, etc)
+      # @param [Fixnum] wait Integer indicating the number of seconds to wait for the popup window to appear.
+      # @return (see #click)
+      def click_popup_button(title, button, wait= 9, user_input=nil)
         #TODO: is winclicker still viable/available?
         wc = WinClicker.new
-        if wc.clickWindowsButton(title, button, waitTime)
+        if wc.clickWindowsButton(title, button, wait)
           passed_to_log("Window '#{title}' button '#{button}' found and clicked.")
           true
         else
@@ -549,7 +587,7 @@ _Example_
         end
         wc = nil
         # get a handle if one exists
-        #    hwnd = $ie.enabled_popup(waitTime)
+        #    hwnd = $ie.enabled_popup(wait)
         #    if (hwnd)  # yes there is a popup
         #      w = WinClicker.new
         #      if ( user_input )
@@ -565,240 +603,160 @@ _Example_
         #    end
       end
 
-      def select_option(browser, how, what, which, value, desc = '')
-        msg  = "Select option #{which}='#{value}' from list #{how}=#{what}. #{desc}"
-        list = browser.select_list(how, what)
-        case which
-          when :text
-            list.select(value)
-          when :value
-            list.select_value(value)
-          when :index
-            all = list.getAllContents
-            txt = all[value]
-            list.select(txt)
-          else
-            na = "#{__method__} cannot support select by '#{which}'. (#{msg})"
-            debug_to_log(na, __LINE__, true)
-            raise na
-        end
-        passed_to_log(msg)
-      rescue
-        failed_to_log("#Unable to #{msg}': '#{$!}'")
-      end
-
-      def select_option_from_list(list, what, what_strg, desc = '')
+      # Select option from select list (dropdown) already identified and passed to the method.  Selection can be by *:text* or *:value*.
+      # @param [Watir::SelectList] list A reference to the specific select list object.
+      # @param [Symbol] how Either :text or :value.
+      # @param [String/Rexexp] what A string or regular expression that will uniquely identify the option to select.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Boolean] nofail If true do not log a failed message if the option is not found in the select list.
+      # @return (see #click)
+      def select_option_from_list(list, how, what, desc = '', nofail = false)
+        msg = build_message("Select :#{how}=>'#{what}", desc)
         ok  = true
-        msg = "#{__method__.to_s.titleize} "
         if list
-          msg << "list id=#{list.id}: "
-          case what
+          case which
             when :text
-              list.select(what_strg) #TODO: regex?
+              list.select(what) #TODO: regex?
             when :value
-              list.select_value(what_strg) #TODO: regex?
+              list.select_value(what) #TODO: regex?
             when :index
-              list.select(list.getAllContents[what_strg.to_i])
+              list.select(list.getAllContents[what.to_i])
             else
-              msg << "select by #{what} not supported. #{desc} (#{__LINE__})"
-              failed_to_log(msg)
+              failed_to_log("#{msg}  Select by #{how} not supported.")
               ok = false
           end
           if ok
-            msg << "#{what}='#{what_strg}' selected. #{desc}"
             passed_to_log(msg)
             true
+          else
+            if nofail
+              passed_to_log("#{msg} Option not found. No Fail specified.")
+              true
+            else
+              failed_to_log("#{msg} Option not found.")
+            end
           end
         else
-          failed_to_log("#{__method__.to_s.titleize} list not found. #{desc} (#{__LINE__})")
+          failed_to_log("#{msg} Select list not found.")
         end
       rescue
-        failed_to_log("#{__method__.to_s.titleize}: #{what}='#{what_strg}' could not be selected: '#{$!}'. #{desc} (#{__LINE__})")
+        failed_to_log("Unable to #{msg} '#{$!}'")
       end
 
-=begin rdoc
-  :category: A_rdoc_test
-Select an option from a specific drop down list.  The drop down (select list) is id
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
-
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-_Example_
+      # Select option from select list identified by *how* and *what*. Option is identified by *which* and *value*
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [Symbol] which Either :text or :value.
+      # @param [String/Rexexp] option A string or regular expression that will uniquely identify the option to select.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Boolean] nofail If true do not log a failed message if the option is not found in the select list.
+      # @return (see #click)
+      def select_option(browser, how, what, which, option, desc = '', nofail = false)
+        list = browser.select_list(how, what)
+        msg = build_message(" from list with :#{how}=>'#{what}", desc)
+        select_option_from_list(list, which, option, msg, nofail)
+      end
 
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  click_no_wait(browser, :link, :text, 'Pickaxe')
+      # @!endgroup Core
 
-=end
+      # @!group Select
 
-      def select_option_by_id_and_option_text(browser, strg, option, nofail=false, desc = '')
-        msg = "Select list id=#{strg} option text='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        list = browser.select_list(:id, strg)
-        list.select(option)
-        #      browser.select_list(:id, strg).select(option)   #(browser.select_list(:id, strg).getAllContents[option])
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        if !nofail
-          failed_to_log("#{msg} '#{$!}'")
-        end
+      # Select option from select list (dropdown) identified by the value in its *:id* attribute. Option is identified by *which* and *value*
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String/Rexexp] option A string or regular expression that will uniquely identify the option to select.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Boolean] nofail If true do not log a failed message if the option is not found in the select list.
+      # @return (see #click)
+      def select_option_by_id_and_option_text(browser, what, option, nofail = false, desc = '')
+        select_option(browser, :id, what, :text, option, desc, nofail)
       end
 
       alias select_option_by_id select_option_by_id_and_option_text
       alias select_option_by_id_and_text select_option_by_id_and_option_text
 
-      def select_option_by_name_and_option_text(browser, strg, option, desc = '')
-        msg = "Select list name=#{strg} option text='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        begin
-          list = browser.select_list(:name, strg)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list(:name,'#{strg}')", "#{browser.class}")
-            raise e
-          end
-        end
-        begin
-          list.select(option)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list#select('#{option}')", "#{browser.class}")
-            raise e
-          end
-        end
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:text* attribute.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String/Rexexp] option A string or regular expression that will uniquely identify the option to select.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def select_option_by_name_and_option_text(browser, what, option, desc = '')
+        select_option(browser, :name, what, :text, option, desc)
       end
 
       alias select_option_by_name select_option_by_name_and_option_text
 
-      def select_option_by_title_and_option_text(browser, strg, option, desc = '')
-        msg = "Select list name=#{strg} option text='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        browser.select_list(:title, strg).select(option)
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:text* attribute.
+      # @param (see #select_option_by_name_and_option_text)
+      # @return (see #click)
+      def select_option_by_title_and_option_text(browser, what, option, desc = '')
+        select_option(browser, :title, what, :text, option, desc)
       end
 
-      def select_option_by_class_and_option_text(browser, strg, option, desc = '')
-        msg = "Select list class=#{strg} option text='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        browser.select_list(:class, strg).select(option)
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:class* attribute. Option is selected by its *:text* attribute.
+      # @param (see #select_option_by_name_and_option_text)
+      # @return (see #click)
+      def select_option_by_class_and_option_text(browser, what, option, desc = '')
+        select_option(browser, :class, what, :text, option, desc)
       end
 
-      def select_option_by_name_and_option_value(browser, strg, option, desc = '')
-        msg = "Select list name=#{strg} option value='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        begin
-          list = browser.select_list(:name, strg)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list(:name,'#{strg}')", "#{browser.class}")
-            raise e
-          end
-        end
-        begin
-          list.select_value(option)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list#select_value('#{option}')", "#{browser.class}")
-            raise e
-          end
-        end
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:value* attribute.
+      # @param (see #select_option_by_name_and_option_text)
+      # @return (see #click)
+      def select_option_by_name_and_option_value(browser, what, option, desc = '')
+        select_option(browser, :name, what, :value, option, desc)
       end
 
-      def select_option_by_id_and_option_value(browser, strg, option, desc = '')
-        msg = "Select list name=#{strg} option value='#{option}' selected."
-        msg << " #{desc}" if desc.length > 0
-        begin
-          list = browser.select_list(:id, strg)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list(:text,'#{strg}')", "#{browser.class}")
-            raise e
-          end
-        end
-        sleep(0.5) unless @targetBrowser.abbrev == 'IE'
-        begin
-          list.select_value(option)
-        rescue => e
-          if not rescue_me(e, __method__, "#{__LINE__}: select_list#select_value('#{option}')", "#{browser.class}")
-            raise e
-          end
-        end
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:id* attribute. Option is selected by its *:value* attribute.
+      # @param (see #select_option_by_name_and_option_text)
+      # @return (see #click)
+      def select_option_by_id_and_option_value(browser, what, option, desc = '')
+        select_option(browser, :id, what, :value, option, desc)
       end
 
-      def select_option_by_id_and_index(browser, strg, idx, desc = '')
-        msg = "Select list id=#{strg} index='#{idx}' selected."
-        msg << " #{desc}" if desc.length > 0
-        list = browser.select_list(:id, strg)
-        all  = list.getAllContents
-        txt  = all[idx]
-        browser.select_list(:id, strg).set(browser.select_list(:id, strg).getAllContents[idx])
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:id* attribute.
+      # Option is selected by its index withing the select list's array of options.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [Fixnum] index An integer that indicates the index of the element within the array of options.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def select_option_by_id_and_index(browser, what, index, desc = '')
+        select_option(browser, :id, what, :index, index, desc)
       end
 
-      def select_option_by_name_and_index(browser, strg, idx)
-      # TODO add check that both list and option exist
-        msg = "Select list name=#{strg} index='#{idx}' selected."
-        msg << " #{desc}" if desc.length > 0
-        browser.select_list(:name, strg).set(browser.select_list(:name, strg).getAllContents[idx])
-        if validate(browser, @myName, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:index* attribute.
+      # @param (see #select_option_by_id_and_index)
+      # @return (see #click)
+      def select_option_by_name_and_index(browser, what, option, desc = '')
+        select_option(browser, :name, what, :index, option, desc)
       end
 
-      def select_option_by_xpath_and_index(browser, strg, idx)
-        msg = "Select list xpath=#{strg} index='#{idx}' selected."
-        msg << " #{desc}" if desc.length > 0
-        browser.select_list(:xpath, strg).set(browser.select_list(:xpath, strg).getAllContents[idx])
-        if validate(browser, nil, __LINE__)
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        failed_to_log("#{msg} '#{$!}'")
+      # Select option from select list (dropdown) identified by the xpath command supplied in *what*. Option is selected by its *:index* attribute.
+      # @param (see #select_option_by_id_and_index)
+      # @return (see #click)
+      def select_option_by_xpath_and_index(browser, what, option, desc = '')
+        select_option(browser, :xpath, what, :index, option, desc)
       end
 
+      # @!endgroup Select
+
+      # @!group Core
+
+      # Set radio button or checkbox to selected.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] element The kind of element to click. Must be either :radio or :checkbox.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the radio or checkbox.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
       def set(browser, element, how, what, value = nil, desc = '')
         msg = "Set #{element} #{how}=>'#{what}' "
         msg << ", :value=>#{value} " if value
@@ -811,112 +769,265 @@ _Example_
           else
             failed_to_log("#{__method__}: #{element} not supported")
         end
-        if validate(browser, @myName, __LINE__)
           passed_to_log(msg)
           true
-        end
       rescue
-        failed_to_log("#{msg} '#{$!}'")
-      end
-
-      def set_checkbox(browser, how, what, value, desc = '')
-        set(browser, :checkbox, how, what, value, desc)
-      end
-
-      def set_checkbox_by_class(browser, strg, value = nil, desc = '')
-        set(browser, :checkbox, :class, strg, value, desc)
-      end
-
-      def set_checkbox_by_id(browser, strg, value = nil, desc = '')
-        set(browser, :checkbox, :id, strg, value, desc)
-      end
-
-      def set_checkbox_by_name(browser, strg, value = nil, desc = '')
-        set(browser, :checkbox, :name, strg, value, desc)
-      end
-
-      def set_checkbox_by_title(browser, strg, value = nil, desc = '')
-        set(browser, :checkbox, :title, strg, value, desc)
-      end
-
-      def set_checkbox_by_value(browser, strg, desc = '')
-        set(browser, :checkbox, :value, strg, nil, desc)
-      end
+          failed_to_log("#{msg} '#{$!}'")
+        end
 
-      def set_radio(browser, how, what, value = nil, desc = '')
-        set(browser, :radio, how, what, value, desc)
+      # Set file field element, identified by *how* and +what, to a specified file path and name.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] filespec The full path and name of the target file.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_file_field(browser, how, what, filespec, desc = '')
+        msg = build_message("Set file field #{how}=>#{what} to '#{filespec}.", desc)
+        ff = browser.file_field(how, what)
+        if ff
+          ff.set filespec
+          sleep_for(8)
+            passed_to_log(msg)
+            true
+        else
+          failed_to_log("#{msg} File field not found.")
+        end
+      rescue
+        failed_to_log("Unable to #{msg} '#{$!}'")
       end
 
+      # Set radio button as selected using two element attributes.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how1 The first element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what1 A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [Symbol] how2 The second element attribute used to identify the specific element.
+      # @param [String, Regexp] what2 A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
       def set_radio_two_attributes(browser, how1, what1, how2, what2, desc = '')
-        msg = "Set radio #{how1}='#{what1}', #{how2}= #{what2}"
-        msg << " '#{desc}' " if desc.length > 0
+        msg = build_message("Set radio #{how1}='#{what1}', #{how2}= #{what2}", desc)
         browser.radio(how1 => what1, how2 => what2).set
-        if validate(browser, @myName, __LINE__)
           passed_to_log(msg)
           true
-        end
       rescue
         failed_to_log("#{msg} '#{$!}'")
       end
 
-      def set_radio_by_class(browser, strg, value = nil, desc = '')
-        set(browser, :radio, :class, strg, value, desc)
+      #def set_radio_no_wait_by_index(browser, index, desc = '')
+      #  #TODO: Not supported by Watir 1.8.x
+      #  msg    = "Radio :index=#{index} "
+      #  radios = browser.radios
+      #  debug_to_log("\n#{radios}")
+      #  radio = radios[index]
+      #  debug_to_log("\n#{radio}")
+      #  radio.click_no_wait
+      #    msg << 'set ' + desc
+      #    passed_to_log(msg)
+      #    true
+      #rescue
+      #  msg << 'not found ' + desc
+      #  failed_to_log("#{msg} (#{__LINE__})")
+      #end
+
+      # @!endgroup Core
+
+      # @!group Set
+
+      # Set checkbox as checked. Checkbox is identified by the attribute specified in *how* with value *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the checkbox.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_checkbox(browser, how, what, value = nil, desc = '')
+        set(browser, :checkbox, how, what, value, desc)
       end
 
-      def set_radio_by_id(browser, strg, value = nil, desc = '')
-        set(browser, :radio, :id, strg, value, desc)
+      # Set checkbox as checked identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the checkbox.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_checkbox_by_class(browser, what, value = nil, desc = '')
+        set(browser, :checkbox, :class, what, value, desc)
       end
 
-      def set_radio_by_index(browser, index, desc = '')
-        set(browser, :radio, :index, index, value, desc)
+      # Set checkbox as checked identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_checkbox_by_id(browser, what, value = nil, desc = '')
+        set(browser, :checkbox, :id, what, value, desc)
       end
 
-      def set_radio_by_name(browser, strg, value = nil, desc = '')
-        set(browser, :radio, :name, strg, value, desc)
+      # Set checkbox as checked identified by its *:name* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_checkbox_by_name(browser, what, value = nil, desc = '')
+        set(browser, :checkbox, :name, what, value, desc)
       end
 
-      def set_radio_by_title(browser, strg, value = nil, desc = '')
-        set(browser, :radio, :title, strg, value, desc)
+      # Set checkbox as checked identified by its *:title* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_checkbox_by_title(browser, what, value = nil, desc = '')
+        set(browser, :checkbox, :title, what, value, desc)
       end
 
-      def set_radio_by_value(browser, strg, desc = '')
-        set(browser, :radio, :value, strg, nil, desc)
+      # Set checkbox as checked identified by its *:value* attribute with the value in *what*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_checkbox_by_value(browser, what, desc = '')
+        set(browser, :checkbox, :value, what, nil, desc)
       end
 
-      def set_radio_no_wait_by_index(browser, index, desc = '')
-        #TODO: Not supported by Watir 1.8.x
-        msg    = "Radio :index=#{index} "
-        radios = browser.radios
-        debug_to_log("\n#{radios}")
-        radio = radios[index]
-        debug_to_log("\n#{radio}")
-        radio.click_no_wait
-        if validate(browser)
-          msg << 'set ' + desc
-          passed_to_log(msg)
-          true
-        end
-      rescue
-        msg << 'not found ' + desc
-        failed_to_log("#{msg} (#{__LINE__})")
+      # Set radio button as set. Radio is identified by the attribute specified in *how* with value *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox)
+      # @return (see #click)
+      def set_radio(browser, how, what, value = nil, desc = '')
+        set(browser, :radio, how, what, value, desc)
       end
 
-      def set_radio_by_name_and_index(browser, name, index, desc = '')
-        set_radio_two_attributes(browser, :name, name, :index, index, desc)
+      # Set radio button as set identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      def set_radio_by_class(browser, what, value = nil, desc = '')
+        set(browser, :radio, :class, what, value, desc)
       end
 
-      def set_radio_by_name_and_text(browser, name, text, desc = '')
-        set_radio_two_attributes(browser, :name, name, :text, text, desc)
-      end
+      # Set radio button as set identified by its *:id* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_radio_by_id(browser, what, value = nil, desc = '')
+        set(browser, :radio, :id, what, value, desc)
+        end
 
+      # Set radio button as set identified by its index within the array of radio buttons found in the container specified by *browser*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Fixnum] index An integer that indicates the index of the element within *browser*.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_radio_by_index(browser, index, desc = '')
+        set(browser, :radio, :index, index, nil, desc)
+      end
+
+      # Set radio button as set identified by its *:name* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_radio_by_name(browser, what, value = nil, desc = '')
+        set(browser, :radio, :name, what, value, desc)
+      end
+
+      # Set radio button as set identified by its *:title* attribute with the value in *what*. It's *:value* attribute can also be used
+      # when needed by specifying *value*.
+      # @param (see #set_checkbox_by_class)
+      # @return (see #click)
+      def set_radio_by_title(browser, what, value = nil, desc = '')
+        set(browser, :radio, :title, what, value, desc)
+      end
+
+      # Set radio button as set identified by its *:value* attribute with the value in *what*.
+      # @param (see #set_checkbox_by_value)
+      # @return (see #click)
+      def set_radio_by_value(browser, what, desc = '')
+        set(browser, :radio, :value, what, nil, desc)
+      end
+
+      # Set radio button as set identified by its *:name* attribute with the value in *what*
+      # and its index within the array of radio buttons with that :name
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
+      # @param [Fixnum] index An integer that indicates the index of the radio button to be set.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_radio_by_name_and_index(browser, what, index, desc = '')
+        set_radio_two_attributes(browser, :name, what, :index, index, desc)
+      end
+
+      # Set radio button as set identified by its *:name* attribute with the value in *what*
+      # and its index within the array of radio buttons with that :name
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
+      # @param [String, Regexp] text A string or a regular expression to be found in the *:text* attribute that uniquely identifies the the radio button to be set.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_radio_by_name_and_text(browser, what, text, desc = '')
+        set_radio_two_attributes(browser, :name, what, :text, text, desc)
+      end
+
+      # Set radio button as set identified by its *:value* attribute with the value in *what*
+      # and its index within the array of radio buttons with that :name
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute that identifies the group of radio buttons.
+      # @param [Fixnum] index An integer that indicates the index of the radio button to be set.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
       def set_radio_by_value_and_index(browser, value, index, desc = '')
         set_radio_two_attributes(browser, :value, value, :index, index, desc)
       end
 
-      def set_radio_by_name_and_value(browser, strg, value, desc = '')
-        set_radio(browser, :name, strg, value, desc)
-      end
-
+      # Set radio button as set identified by its *:name* attribute with the value in *what*
+      # and the *:value* attribute with the value in *value*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute that uniquely identifies the the radio button to be set.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_radio_by_name_and_value(browser, what, value, desc = '')
+        set_radio(browser, :name, what, value, desc)
+      end
+
+      # Set file field element, identified by its *:name* attribute with the value in *what*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] filespec The full path and name of the target file.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def set_file_field_by_name(browser, what, filespec, desc = '')
+        set_file_field(browser, :name, what, filespec, desc)
+      end
+
+      # Set file field element, identified by its *:id* attribute with the value in *what*.
+      # @param (see #set_file_field_by_name)
+      # @return (see #click)
+      def set_file_field_by_id(browser, what, filespec, desc = '')
+        set_file_field(browser, :id, what, filespec, desc)
+      end
+
+      # @!endgroup Set
+
+      # @!group Core
+
+      # Clear (unset) radio, checkbox or text field as identified by the attribute specified in *how* with value *what*.
+      # It's *:value* attribute can also be used when needed by specifying *value* (Ignored for text_field).
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] element The kind of element to clear. Must be :radio, :checkbox or :text_field.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
+      # In the case of text_field this is the string to be entered in the field.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
       def clear(browser, element, how, what, value = nil, desc = '')
         msg = "Clear #{element} #{how}=>'#{what}' "
         msg << ", value=>#{value} " if value
@@ -931,122 +1042,89 @@ _Example_
           else
             failed_to_log("#{__method__}: #{element} not supported")
         end
-        if validate(browser, @myName, __LINE__)
           passed_to_log(msg)
           true
-        end
       rescue
         failed_to_log("#{msg} '#{$!}'")
       end
 
-      def clear_checkbox(browser, how, what, value = nil, desc = '')
-        clear(browser, :checkbox, how, what, value, desc)
-      end
+      # @!endgroup Core
 
-      def clear_checkbox_by_name(browser, strg, value = nil, desc = '')
-        clear(browser, :checkbox, :name, strg, value, desc)
-      end
+      # @!group Clear
 
-      def clear_checkbox_by_id(browser, strg, value = nil, desc = '')
-        clear(browser, :checkbox, :id, strg, value, desc)
+      # Clear (uncheck) checkbox identified by the attribute specified in *how* with value *what*.
+      # It's *:value* attribute can also be used when needed by specifying *value*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def clear_checkbox(browser, how, what, value = nil, desc = '')
+        clear(browser, :checkbox, how, what, value, desc)
       end
 
+      # Clear (uncheck) checkbox identified by its *:name* attribute with value *what*.
+      # It's *:value* attribute can also be used when needed by specifying *value*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      def clear_checkbox_by_name(browser, what, value = nil, desc = '')
+        clear(browser, :checkbox, :name, what, value, desc)
+      end
+
+      # Clear (uncheck) checkbox identified by its *:id* attribute with value *what*.
+      # It's *:value* attribute can also be used when needed by specifying *value*.
+      # @param (see #set_file_field_by_name)
+      # @return (see #click)
+      def clear_checkbox_by_name(browser, what, value = nil, desc = '')
+        clear(browser, :checkbox, :id, what, value, desc)
+      end
+
+      # Clear (unset) radio button identified by the attribute specified in *how* with value *what*.
+      # It's *:value* attribute can also be used when needed by specifying *value*.
+      # This clears the specified radio without setting any other radio buttons on.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
       def clear_radio(browser, how, what, value = nil, desc = '')
         clear(browser, :radio, how, what, value, desc)
       end
 
-    # Set skip_value_check = true when string is altered by application and/or
-    # this method will be followed by validate_text
-      def clear_textfield(browser, how, which, skip_value_check = false)
-        if browser.text_field(how, which).exists?
-          tf = browser.text_field(how, which)
-          if validate(browser, @myName, __LINE__)
-            tf.clear
-            if validate(browser, @myName, __LINE__)
-              if tf.value == ''
-                passed_to_log("Textfield #{how}='#{which}' cleared.")
-                true
-              elsif skip_value_check
-                passed_to_log("Textfield  #{how}='#{which}' cleared. (skip value check)")
-                true
-              else
-                failed_to_log("Textfield  #{how}='#{which}' not cleared: Found:'#{tf.value}'. (#{__LINE__})")
-              end
-            end
-          end
-        else
-          failed_to_log("Textfield id='#{id}' to clear. (#{__LINE__})")
-        end
-      rescue
-        failed_to_log("Textfield id='#{id}' could not be cleared: '#{$!}'. (#{__LINE__})")
-      end
-
-      def set_file_field(browser, how, what, filespec, desc = '')
-        msg = "Set file field #{how}=>#{what} to '#{filespec}."
-        msg << " #{desc}" if desc.length > 0
-        ff = browser.file_field(how, what)
-        if ff
-          ff.set filespec
-          sleep_for(8)
-          if validate(browser, @myName, __LINE__)
-            passed_to_log(msg)
-            true
-          end
-        else
-          failed_to_log("#{msg} File field not found.")
-        end
-      rescue
-        failed_to_log("Unable to #{msg} '#{$!}'")
-      end
-
-      def set_file_field_by_name(browser, strg, path, desc = '')
-        set_file_field(browser, :name, strg, path, desc)
-      end
-
-      def set_file_field_by_id(browser, strg, path, desc = '')
-        set_file_field(browser, :id, strg, path, desc)
-      end
-
-=begin rdoc
-  :category: A_rdoc_test
-Enter a string into a text field element identified by an attribute type and a value.
-After the entry the value in the text field is validated against the input value unless the *skip_value_check*
-parameter is set to true
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
-
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @!endgroup Clear
 
-*value* - a string to be entered in the text field
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-*skip_value_check* (Optional, default is false). Set to true to prevent the built-in verification
-that the text field actually contains the value entered.  Useful when application reformats
-or otherwise edits the input string.
-
-_Example_
-
-  set_text_field(browser, :name, /thisTextfield/, 'The text to enter')
-
-=end
+      # @!group Core
 
+      # Set text field as identified by the attribute specified in *how* with value in *what* to the string specified in *value*.
+      # This method differs from set() in that it validates that the text field has been set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # This is useful when the text_field performs formatting on the entered string. See set_text_field_and_validate()
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] value A string to enter into the text field.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Boolean] skip_value_check Forces verification of value in text field to pass.
+      # @return (see #click)
       def set_text_field(browser, how, what, value, desc = '', skip_value_check = false)
         #TODO: fix this to handle Safari password field
-        msg = "Set textfield #{how}='#{what}' to '#{value}'"
-        msg << " #{desc}" if desc.length > 0
+        msg = build_message("Set textfield #{how}='#{what}' to '#{value}'", desc)
         msg << " (Skip value check)" if skip_value_check
         if browser.text_field(how, what).exists?
           tf = browser.text_field(how, what)
-          debug_to_log("#{tf.inspect}")
-          if validate(browser, @myName, __LINE__)
+          #debug_to_log("#{tf.inspect}")
             tf.set(value)
-            if validate(browser, @myName, __LINE__)
               if tf.value == value
                 passed_to_log(msg)
                 true
@@ -1056,10 +1134,8 @@ _Example_
               else
                 failed_to_log("#{msg}: Found:'#{tf.value}'.")
               end
-            end
-          end
         else
-          failed_to_log("Textfield #{how}='#{what}' not found to set to '#{value}''")
+          failed_to_log("#{msg}: Textfield #{how}='#{what}' not found")
         end
       rescue
         failed_to_log("Unable to '#{msg}': '#{$!}'")
@@ -1067,99 +1143,58 @@ _Example_
 
       alias set_textfield set_text_field
 
-      def set_textfield_by_name(browser, name, value, desc = '', skip_value_check = false)
-        if browser.text_field(:name, name).exists?
-          tf = browser.text_field(:name, name)
-          # Workaround because browser.text_field doesn't work for password fields in Safari
-        elsif @browserAbbrev.eql?("S")
-          tf = browser.password(:name, name)
-        end
-        if tf.exists?
-          if validate(browser, @myName, __LINE__)
-            tf.set(value)
-            if validate(browser, @myName, __LINE__)
-              if tf.value == value
-                passed_to_log("Set textfield name='#{name}' to '#{value}' #{desc}")
+      # Clear text field as identified by the attribute specified in *how* with value in *what* to the string specified in *value*.
+      # This method differs from set() in that 1( it uses the Watir #clear method, 2( it validates that the text field has been
+      # set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # This is useful when the text_field performs formatting on the entered string. See set_text_field_and_validate()
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [Boolean] skip_value_check Forces verification of value in text field to pass.
+      # @return (see #click)
+      def clear_textfield(browser, how, what, skip_value_check = false)
+        if browser.text_field(how, what).exists?
+          tf = browser.text_field(how, what)
+            tf.clear
+              if tf.value == ''
+                passed_to_log("Textfield #{how}='#{what}' cleared.")
                 true
               elsif skip_value_check
-                passed_to_log("Set textfield name='#{name}' to '#{value}' #{desc} (skip value check)")
+                passed_to_log("Textfield  #{how}='#{what}' cleared. (skip value check)")
                 true
               else
-                failed_to_log("Set textfield name='#{name}' to '#{value}': Found:'#{tf.value}'.  #{desc} (#{__LINE__})")
+                failed_to_log("Textfield  #{how}='#{what}' not cleared: Found:'#{tf.value}'. (#{__LINE__})")
               end
-            end
-          end
         else
-          failed_to_log("Textfield name='#{name}' not found to set to '#{value}'.  #{desc} (#{__LINE__})")
+          failed_to_log("Textfield id='#{id}' to clear. (#{__LINE__})")
         end
       rescue
-        failed_to_log("Textfield name='#{name}' could not be set to '#{value}': '#{$!}'. #{desc} (#{__LINE__})")
-      end
-
-=begin rdoc
-  :category: A_rdoc_test
-Enter a string into a text field element identified by the value in its id attribute.
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*id* - a string or a regular expression to be found in the id attribute that uniquely identifies the element.
-
-*value* - a string to be entered in the text field
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-*skip_value_check* (Optional, default is false). Set to true to prevent the built-in verification
-that the text field actually contains the value entered.  Useful when application reformats
-or otherwise edits the input string.
-
-_Example_
-
-  set_text_field_by_id(browser, /thisTextfield/, 'The text to enter')
-
-=end
-
-      def set_textfield_by_id(browser, id, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :id, id, value, desc, skip_value_check)
-      end
-
-      def set_textfield_by_title(browser, title, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :title, title, value, desc, skip_value_check)
-      end
-
-      def set_textfield_by_class(browser, strg, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :class, strg, value, desc, skip_value_check)
+        failed_to_log("Textfield id='#{id}' could not be cleared: '#{$!}'. (#{__LINE__})")
       end
 
-=begin rdoc
-  :category: A_rdoc_test
-Enter a string into a text field element identified by an attribute type and a value.
-After the entry the value in the text field is validated against the *valid_value*. Use when the application reformats
-or performs edits on the input value.
-
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
-
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-
-*value* - a string to be entered in the text field
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-*valid_value* (Optional, default is nil). Set to the expected value
-
-_Example_
-
-  set_text_field_and_validate(browser, :id, /AmountTendered/, '7500', 'Dollar formatting', '$7,500.00')
-
-=end
-
-      def set_text_field_and_validate(browser, how, what, value, desc = '', valid_value = nil)
+      #Enter a string into a text field element identified by an attribute type and a value.
+      #After the entry the value in the text field is validated against the *valid_value*. Use when the application reformats
+      #or performs edits on the input value.
+
+      # Set text field as identified by the attribute specified in *how* with value in *what* to the string specified in *value*.
+      # and verify that the text field is set to the string in *valid_value*.
+      #
+      # @example
+      #  set_text_field_and_validate(browser, :id, 'text field id', '99999', 'Dollar format', '$99,999.00')
+      #
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] how The element attribute used to identify the specific checkbox.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] value A string to enter into the text field.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output. Required in this method.
+      # @param [String] valid_value The expected value of the text field, e.g., following reformatting.
+      # @return (see #click)
+      def set_text_field_and_validate(browser, how, what, value, desc, valid_value = nil)
         #NOTE: use when value and valid_value differ as with dollar reformatting
         if set_text_field(browser, how, what, value, desc, true)
           expected = valid_value ? valid_value : value
@@ -1169,34 +1204,98 @@ _Example_
         failed_to_log("Unable to '#{msg}': '#{$!}'")
       end
 
-=begin rdoc
-  :category: A_rdoc_test
-Allows a generic way to fire browser or javascript events on page elements.
-Raises UnknownObjectException if the object is not found or ObjectDisabledException if the object is currently disabled.
-_Parameters_::
-
-*browser* - a reference to the browser window to be tested
-
-*element* - the kind of element to click. Must be one of the elements recognized by Watir.
-Some common values are :link, :button, :image, :div, :span.
-
-*how* - the element attribute used to identify the specific element. Valid values depend on the kind of element.
-Common values: :text, :id, :title, :name, :class, :href (:link only)
-
-*what* - a string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-
-*event* - a string indicating the event to be triggered, e.g., 'onMouseOver', 'onClick', and etc.
-
-*desc* - a string containing a message or description intended to appear in the log and/or report output
-
-_Example_
-
-  # html for a link element:
-  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-  fire_event(browser, :link, :text, 'Pickaxe', 'onMouseOver')
-
-=end
-
+      #def set_password_by_name(browser, name, value, desc = '', skip_value_check = false)
+      #  set_text_field(browser, how, what, value, desc, skip_value_check)
+      #  if browser.text_field(:name, name).exists?
+      #    tf = browser.text_field(:name, name)
+      #    # Workaround because browser.text_field doesn't work for password fields in Safari
+      #  elsif @browserAbbrev.eql?("S")
+      #    tf = browser.password(:name, name)
+      #  end
+      #  if tf.exists?
+      #      tf.set(value)
+      #        if tf.value == value
+      #          passed_to_log("Set textfield name='#{name}' to '#{value}' #{desc}")
+      #          true
+      #        elsif skip_value_check
+      #          passed_to_log("Set textfield name='#{name}' to '#{value}' #{desc} (skip value check)")
+      #          true
+      #        else
+      #          failed_to_log("Set textfield name='#{name}' to '#{value}': Found:'#{tf.value}'.  #{desc} (#{__LINE__})")
+      #        end
+      #  else
+      #    failed_to_log("Textfield name='#{name}' not found to set to '#{value}'.  #{desc} (#{__LINE__})")
+      #  end
+      #rescue
+      #  failed_to_log("Textfield name='#{name}' could not be set to '#{value}': '#{$!}'. #{desc} (#{__LINE__})")
+      #end
+
+      # @!endgroup Core
+
+      # @!group Set
+
+      # Set text field as identified by its *:name* attribute with value in *what* to the string specified in *value*.
+      # This method validates that the text field has been set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
+      # @param [String] value A string to enter into the text field.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output.
+      # Required if *skip_value_check* is set to true.
+      # @param [Boolean] skip_value_check Forces verification of value in text field to pass.
+      # @return (see #click)
+      def set_textfield_by_name(browser, what, value, desc = '', skip_value_check = false)
+        set_text_field(browser, :name, what, value, desc, skip_value_check)
+      end
+
+      # Set text field as identified by its *:id* attribute with value in *what* to the string specified in *value*.
+      # This method validates that the text field has been set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # @param (see #set_textfield_by_name)
+      # @return (see #click)
+      def set_textfield_by_id(browser, what, value, desc = '', skip_value_check = false)
+        set_text_field(browser, :id, what, value, desc, skip_value_check)
+      end
+
+      # Set text field as identified by its *:class* attribute with value in *what* to the string specified in *value*.
+      # This method validates that the text field has been set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # @param (see #set_textfield_by_name)
+      # @return (see #click)
+      def set_textfield_by_title(browser, what, value, desc = '', skip_value_check = false)
+        set_text_field(browser, :title, what, value, desc, skip_value_check)
+      end
+
+      # Set text field as identified by its *:class* attribute with value in *what* to the string specified in *value*.
+      # This method validates that the text field has been set to the specified value.
+      # The value verification can be turned off by setting *skip_value_check* to true.
+      # @param (see #set_textfield_by_name)
+      def set_textfield_by_class(browser, what, value, desc = '', skip_value_check = false)
+        set_text_field(browser, :class, what, value, desc, skip_value_check)
+      end
+
+      # @!endgroup Set
+      # @!group Core
+
+      # Fire an event on a specific DOM element identified by one of its attributes and that attribute's value.
+      #
+      # @example
+      #  # html for a link element:
+      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
+      #
+      #  fire_event(browser, :link, :text, 'Pickaxe', 'onMouseOver')
+      #
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [Symbol] element The kind of element to click. Must be one of the elements recognized by Watir.
+      #   Some common values are :link, :button, :image, :div, :span.
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @param [String] event A string identifying the event to be fired.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      #
       def fire_event(browser, element, how, what, event, desc = '')
         msg  = "#{element.to_s.titlecase}: #{how}=>'#{what}' event:'#{event}'"
         msg1 = "#{element.to_s.titlecase}(#{how}, '#{what}')"
@@ -1220,35 +1319,68 @@ _Example_
             raise e
           end
         end
-        if validate(browser, @myName, __LINE__)
           passed_to_log("Fire event: #{msg}. #{desc}")
           true
-        end
       rescue
         failed_to_log("Unable to fire event: #{msg}. '#{$!}' #{desc}")
       end
 
-      def fire_event_on_link_by_text(browser, strg, event = 'onclick', desc = '')
-        fire_event(browser, :link, :text, strg, event, desc)
+      # @!endgroup Core
+      
+      # @!group Fire Event
+
+      # Fire an event on a link element identified by the value in its text (innerHTML)
+      #
+      # @example
+      #  # html for a link element:
+      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
+      #
+      #  fire_event_on_link_by_text(browser, 'Pickaxe', 'onMouseOver')
+      #
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @param [String] event A string identifying the event to be fired.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @return (see #click)
+      #
+      def fire_event_on_link_by_text(browser, what, event, desc = '')
+        fire_event(browser, :link, :text, what, event, desc)
       end
 
       alias fire_event_text fire_event_on_link_by_text
       alias fire_event_by_text fire_event_on_link_by_text
 
-      def fire_event_on_link_by_id(browser, strg, event = 'onclick', desc = '')
-        fire_event(browser, :link, :id, strg, event, desc)
+      # Fire an event on a link element identified by the value in its *:id* attribute.
+      #
+      # @example
+      #  # html for a link element:
+      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
+      #
+      #  fire_event_on_link_by_id(browser, 'one', 'onMouseOver')
+      #
+      # @param (see #fire_event_on_link_by_text)
+      # @return (see #click)
+      #
+      def fire_event_on_link_by_id(browser, what, event, desc = '')
+        fire_event(browser, :link, :id, what, event, desc)
       end
 
       alias fire_event_id fire_event_on_link_by_id
       alias fire_event_by_id fire_event_on_link_by_id
 
-      def fire_event_on_image_by_src(browser, strg, event = 'onclick', desc = '')
-        fire_event(browser, :img, :src, strg, event, desc)
+      # Fire an event on a image element identified by the value in its *:src* attribute.
+      # Take care to escape characters in the source url that are reserved by Regexp.
+      # @param (see #fire_event_on_link_by_text)
+      # @return (see #click)
+      #
+      def fire_event_on_image_by_src(browser, what, event, desc = '')
+        fire_event(browser, :img, :src, what, event, desc)
       end
 
       alias fire_event_src fire_event_on_image_by_src
       alias fire_event_image_by_src fire_event_on_image_by_src
 
+      # @!endgroup Fire Event
 
     end
   end