page-object 2.0.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4df22c84861242c7966223ea92954fadee7da8
-  data.tar.gz: 02756b9b394d920567793cf474ed2c175428c79b
+  metadata.gz: 4a027ac9f94936e64f53e55c46687f9628df6cd6
+  data.tar.gz: 1b76a2f6e4f559bb9ba2b9e458f6672e3f0bd553
 SHA512:
-  metadata.gz: 8d067360ea72b18ba508339efb5504d631b31fb55ef8a67d0cdb582b627fb57196d5818cd76fae440094d00ecd0ca1f19e1a426581ecdd887d7965d9ed6f89b4
-  data.tar.gz: 87c90ae9d1602f49c4cc203a5b1f2e4b1699412383f244deee88cdf1a94f4a07077f668459ee4ac2c34448e8ef72d9671aa06d96ddfc1baf68aecaa6136bc3fd
+  metadata.gz: cdd0a78f1534741dc43e37c68448f2f2d1030c5e468842bd0086fc1f57a7fb95c372617601a2ee50bbf4bb16bca1b66dd1a78bf66f736478da76327890b3c766
+  data.tar.gz: c51cc96e81da1c2b0ee8b2584678bbee80195326690360fd7f7c63e36bd47f7b95dc7439bc7955d76d597ebc3de3148a9151cbb498a81409e3b5149370319e54

data/.travis.yml

@@ -21,5 +21,4 @@ before_script:
 script: bundle exec rake $RAKE_TASK
 env:
   - RAKE_TASK=spec
-  - RAKE_TASK=features:watir WATIR_BRANCH=master
-  - RAKE_TASK=features:selenium
+  - RAKE_TASK=features

data/ChangeLog

@@ -1,3 +1,13 @@
+Version 2.1 / 2017-3-6
+This is the first of three quick releases that will undo a lot of
+legacy code and end with a far more flexible gem.
+* Enhancements
+  * Removed Selenium Platform.
+        Still support Selenium driver by wrapping it with a Watir browser.
+  * Added ability to locate indexed element by regex (Thanks Sean MacGahan)
+  * Removed all direct delegates.  Now relies on method_missing to call Watir methods.
+    - You may have to change RSpec matchers to use method instead of predicate.
+
 Version 2.0.0 / 2016-11-22
 * Enhancements
   * Added focused? method on element. (Thanks Joe Schulte)

data/README.md

@@ -94,6 +94,18 @@ browser = Selenium::WebDriver.for :firefox
 my_page_object = MyPageObject.new(browser)
 ````
 
+## Notes
+
+### Cucumber usage:
+
+Specify you javasctipt notes:
+```ruby
+AfterConfiguration do |config|
+  PageObject::JavascriptFrameworkFacade.framework=:jquery
+end
+
+```
+
 ## Known Issues
 
 See [http://github.com/cheezy/page-object/issues](http://github.com/cheezy/page-object/issues)

data/Rakefile

@@ -14,21 +14,11 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 task :spec
 
-namespace :features do
-  Cucumber::Rake::Task.new(:watir, "Run features with Watir") do |t|
-    t.profile = "watir"
-  end
+Cucumber::Rake::Task.new(:features, "Run the cucumber features")
 
-  Cucumber::Rake::Task.new(:selenium, "Run features with Selenium") do |t|
-    t.profile = "selenium_webdriver"
-  end
-
-  desc 'Run all features'
-  task :all => [:watir, :selenium]
-end
 
 desc 'Run all specs and cukes'
-task :test => ['spec', 'features:all']
+task :test => ['spec', 'features']
 
 task :lib do
   $LOAD_PATH.unshift(File.expand_path("lib", File.dirname(__FILE__)))

data/cucumber.yml

@@ -2,9 +2,7 @@
 std_opts = "--no-source --color --format pretty" # Cucumber::Formatter::Fuubar"
 %>
 
-default: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
-watir: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
-selenium_webdriver: DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only
+default: DRIVER=WATIR <%= std_opts %>
+selenium: DRIVER=SELENIUM <%= std_opts %>
 focus: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only --tags @focus
-#focus:  DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only --tags @focus
 

data/lib/page-object.rb

@@ -11,12 +11,8 @@ require 'page-object/section_collection'
 require 'page-object/widgets'
 
 require 'watir'
-require 'page-object/platforms/watir/element'
 require 'page-object/platforms/watir/page_object'
-require 'page-object/platforms/selenium_webdriver/element'
-require 'page-object/platforms/selenium_webdriver/page_object'
 
-require 'selenium/webdriver/common/error'
 #
 # Module that when included adds functionality to a page object.  This module
 # will add numerous class and instance methods that you use to define and
@@ -51,20 +47,16 @@ module PageObject
   include PagePopulator
 
   def method_missing(method, *args, &block)
-    if @root_element && @root_element.respond_to?(method)
-      @root_element.send(method, *args, &block)
-    else
-      super
-    end
+    @root_element.send(method, *args, &block)
   end
 
   def respond_to_missing?(method, include_all = false)
     @root_element && @root_element.respond_to?(method) || super
   end
 
-  # @return [Watir::Browser or Selenium::WebDriver::Driver] the platform browser passed to the constructor
+  # @return the platform browser passed to the constructor
   attr_reader :browser
-  # @return [PageObject::WatirPageObject or PageObject::SeleniumPageObject] the platform page object
+  # @return [PageObject::WatirPageObject] the platform page object
   attr_reader :platform
 
   #
@@ -164,7 +156,7 @@ module PageObject
   # Returns the text of the current page
   #
   def text
-    root.text
+    platform.text
   end
 
   #
@@ -291,10 +283,10 @@ module PageObject
   #   end
   #
   # @param [Hash] identifier how we find the frame.  The valid keys are:
-  #   * :id => Watir and Selenium
-  #   * :index => Watir and Selenium
-  #   * :name => Watir and Selenium
-  #   * :class => Watir only
+  #   * :id
+  #   * :index
+  #   * :name
+  #   * :class
   # @param frame passed from a previous call to in_frame.  Used to nest calls
   # @param block that contains the calls to elements that exist inside the frame.
   #
@@ -312,10 +304,10 @@ module PageObject
   #   end
   #
   # @param [Hash] identifier how we find the iframe.  The valid keys are:
-  #   * :id => Watir and Selenium
-  #   * :index => Watir and Selenium
-  #   * :name => Watir and Selenium
-  #   * :class => Watir only
+  #   * :id
+  #   * :index
+  #   * :name
+  #   * :class
   # @param frame passed from a previous call to in_iframe.  Used to nest calls
   # @param block that contains the calls to elements that exist inside the iframe.
   #

data/lib/page-object/accessors.rb

@@ -7,9 +7,6 @@ module PageObject
   # when you include the PageObject module.  These methods will generate another
   # set of methods that provide access to the elements on the web pages.
   #
-  # @see PageObject::WatirPageObject for the watir implementation of the platform delegate
-  # @see PageObject::SeleniumPageObject for the selenium implementation of the platform delegate
-  #
   module Accessors
 
     #
@@ -145,10 +142,10 @@ module PageObject
     #   end
     #
     # @param [Hash] identifier how we find the frame.  The valid keys are:
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :regexp => Watir only
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :regexp
     # @param frame passed from a previous call to in_frame.  Used to nest calls
     # @param block that contains the calls to elements that exist inside the frame.
     #
@@ -169,10 +166,10 @@ module PageObject
     #   end
     #
     # @param [Hash] identifier how we find the frame.  The valid keys are:
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :regexp => Watir only
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :regexp
     # @param frame passed from a previous call to in_iframe.  Used to nest calls
     # @param block that contains the calls to elements that exist inside the iframe.
     #
@@ -193,18 +190,7 @@ module PageObject
     #   # 'first_name?' methods
     #
     # @param  [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a text field.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :label => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :title => Watir and Selenium
-    #   * :value => Watir only
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a text field.
     # @param optional block to be invoked when element method is called
     #
     def text_field(name, identifier={:index => 0}, &block)
@@ -229,16 +215,7 @@ module PageObject
     #   # will generate 'user_id', 'user_id_element' and 'user_id?' methods
     #
     # @param [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a hidden field.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :value => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a hidden field.
     # @param optional block to be invoked when element method is called
     #
     def hidden_field(name, identifier={:index => 0}, &block)
@@ -261,15 +238,7 @@ module PageObject
     #   # 'address?' methods
     #
     # @param  [String] the name used for the generated methods
-    # @param [Hash] identifier how we find a text area.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :label => Watir and Selenium
+    # @param [Hash] identifier how we find a text area.
     # @param optional block to be invoked when element method is called
     #
     def text_area(name, identifier={:index => 0}, &block)
@@ -297,17 +266,7 @@ module PageObject
     #   # will generate 'state', 'state=', 'state_element', 'state?', "state_options" methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a select list.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir only
-    #   * :value => Watir only
-    #   * :xpath => Watir and Selenium
-    #   * :label => Watir and Selenium
+    # @param [Hash] identifier how we find a select list.
     # @param optional block to be invoked when element method is called
     #
     def select_list(name, identifier={:index => 0}, &block)
@@ -337,19 +296,7 @@ module PageObject
     #   # will generate 'add_to_cart', 'add_to_cart_element', and 'add_to_cart?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a link.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :href => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :link => Watir and Selenium
-    #   * :link_text => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :title => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a link.
     # @param optional block to be invoked when element method is called
     #
     def link(name, identifier={:index => 0}, &block)
@@ -373,16 +320,7 @@ module PageObject
     #   # 'active_element', and 'active?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a checkbox.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :value => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :label => Watir and Selenium
+    # @param [Hash] identifier how we find a checkbox.
     # @param optional block to be invoked when element method is called
     #
     def checkbox(name, identifier={:index => 0}, &block)
@@ -413,16 +351,7 @@ module PageObject
     #   # 'north_element', and 'north?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a radio button.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :value => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :label => Watir and Selenium
+    # @param [Hash] identifier how we find a radio button.
     # @param optional block to be invoked when element method is called
     #
     def radio_button(name, identifier={:index => 0}, &block)
@@ -456,7 +385,7 @@ module PageObject
     # @param [Symbol] the name used for the generated methods
     # @param [Hash] shared identifier for the radio button group. Typically, a 'name' attribute.
     # The valid keys are:
-    # * :name => Watir and Selenium
+    # * :name
     #
     def radio_button_group(name, identifier)
       define_method("select_#{name}") do |value|
@@ -497,18 +426,7 @@ module PageObject
     #   # will generate 'purchase', 'purchase_element', and 'purchase?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a button.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir only
-    #   * :value => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :src => Watir and Selenium (input type=image only)
-    #   * :alt => Watir and Selenium (input type=image only)
+    # @param [Hash] identifier how we find a button.
     # @param optional block to be invoked when element method is called
     #
     def button(name, identifier={:index => 0}, &block)
@@ -528,16 +446,7 @@ module PageObject
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a div.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :title => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a div.
     # @param optional block to be invoked when element method is called
     #
     def div(name, identifier={:index => 0}, &block)
@@ -557,16 +466,7 @@ module PageObject
     #   # will generate 'alert', 'alert_element', and 'alert?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a span.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :title => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a span.
     # @param optional block to be invoked when element method is called
     #
     def span(name, identifier={:index => 0}, &block)
@@ -580,22 +480,14 @@ module PageObject
     #
     # adds three methods - one to return the text for the table, one
     # to  retrieve the table element, and another to
-    # check the table's existence.  The existence method does not work
-    # on Selenium so it should not be called.
+    # check the table's existence.
     #
     # @example
     #   table(:cart, :id => 'shopping_cart')
     #   # will generate a 'cart', 'cart_element' and 'cart?' method
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a table.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a table.
     # @param optional block to be invoked when element method is called
     #
     def table(name, identifier={:index => 0}, &block)
@@ -616,16 +508,7 @@ module PageObject
     #   # will generate 'total', 'total_element', and 'total?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a cell.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :css => Watir and Selenium
+    # @param [Hash] identifier how we find a cell.
     # @param optional block to be invoked when element method is called
     #
     def cell(name, identifier={:index => 0}, &block)
@@ -648,15 +531,7 @@ module PageObject
     #   # will generate 'sums', 'sums_element', and 'sums?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a cell.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :text => Watir only
-    #   * :xpath => Watir and Selenium
-    #   * :css => Watir and Selenium
+    # @param [Hash] identifier how we find a cell.
     # @param optional block to be invoked when element method is called
     #
     def row(name, identifier={:index => 0}, &block)
@@ -677,16 +552,7 @@ module PageObject
     #   # will generate 'logo_element', 'logo_loaded?', and 'logo?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find an image.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :alt => Watir and Selenium
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :src => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an image.
     # @param optional block to be invoked when element method is called
     #
     def image(name, identifier={:index => 0}, &block)
@@ -707,14 +573,7 @@ module PageObject
     #   # will generate 'login_element' and 'login?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a form.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :action => Watir and Selenium
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a form.
     # @param optional block to be invoked when element method is called
     #
     def form(name, identifier={:index => 0}, &block)
@@ -731,15 +590,7 @@ module PageObject
     #   # will generate 'item_one', 'item_one_element', and 'item_one?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a list item.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a list item.
     # @param optional block to be invoked when element method is called
     #
     def list_item(name, identifier={:index => 0}, &block)
@@ -761,14 +612,7 @@ module PageObject
     #   # will generate 'menu', 'menu_element' and 'menu?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find an unordered list.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an unordered list.
     # @param optional block to be invoked when element method is called
     #
     def unordered_list(name, identifier={:index => 0}, &block)
@@ -790,14 +634,7 @@ module PageObject
     #   # will generate 'top_five', 'top_five_element' and 'top_five?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find an ordered list.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an ordered list.
     # @param optional block to be invoked when element method is called
     #
     def ordered_list(name, identifier={:index => 0}, &block)
@@ -819,13 +656,7 @@ module PageObject
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find a H1.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    #   by combining of any of the following except xpath.
     # @param optional block to be invoked when element method is called
     #
     def h1(name, identifier={:index => 0}, &block)
@@ -845,14 +676,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a H2.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a H2.
     # @param optional block to be invoked when element method is called
     #
     def h2(name, identifier={:index => 0}, &block)
@@ -872,14 +696,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a H3.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a H3.
     # @param optional block to be invoked when element method is called
     #
     def h3(name, identifier={:index => 0}, &block)
@@ -899,14 +716,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a H4.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a H4.
     # @param optional block to be invoked when element method is called
     #
     def h4(name, identifier={:index => 0}, &block)
@@ -926,14 +736,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a H5.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a H5.
     # @param optional block to be invoked when element method is called
     #
     def h5(name, identifier={:index => 0}, &block)
@@ -953,14 +756,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a H6.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a H6.
     # @param optional block to be invoked when element method is called
     #
     def h6(name, identifier={:index => 0}, &block)
@@ -980,14 +776,7 @@ module PageObject
     #   # will generate 'title', 'title_element', and 'title?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a paragraph.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a paragraph.
     # @param optional block to be invoked when element method is called
     #
     def paragraph(name, identifier={:index => 0}, &block)
@@ -1008,16 +797,7 @@ module PageObject
     #   # will generate 'the_file=', 'the_file_element', and 'the_file?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a file_field.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :title => Watir and Selenium
-    #   * :xpath => Watir and Selenium
-    #   * :label => Watir and Selenium
+    # @param [Hash] identifier how we find a file_field.
     # @param optional block to be invoked when element method is called
     #
     def file_field(name, identifier={:index => 0}, &block)
@@ -1037,15 +817,7 @@ module PageObject
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a label.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a label.
     # @param optional block to be invoked when element method is called
     #
     def label(name, identifier={:index => 0}, &block)
@@ -1065,15 +837,7 @@ module PageObject
     #   # will generate 'message', 'message_element', and 'message?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find an area.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :text => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an area.
     # @param optional block to be invoked when element method is called
     #
     def area(name, identifier={:index => 0}, &block)
@@ -1093,14 +857,7 @@ module PageObject
     #   # will generate 'my_canvas_element' and 'my_canvas?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a canvas.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a canvas.
     # @param optional block to be invoked when element method is called
     #
     def canvas(name, identifier={:index => 0}, &block)
@@ -1116,14 +873,7 @@ module PageObject
     #   # will generate 'acdc_element' and 'acdc?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find an audio element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an audio element.
     # @param optional block to be invoked when element method is called
     #
     def audio(name, identifier={:index => 0}, &block)
@@ -1139,14 +889,7 @@ module PageObject
     #   # will generate 'movie_element' and 'movie?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a video element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a video element.
     # @param optional block to be invoked when element method is called
     #
     def video(name, identifier={:index => 0}, &block)
@@ -1162,14 +905,7 @@ module PageObject
     #   # will generate 'bold', 'bold_element', and 'bold?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a b.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a b.
     # @param optional block to be invoked when element method is called
     #
     def b(name, identifier={:index => 0}, &block)
@@ -1189,14 +925,7 @@ module PageObject
     #   # will generate 'italic', 'italic_element', and 'italic?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a i. You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a i.
     # @param optional block to be invoked when element method is called
     #
     def i(name, identifier={:index => 0}, &block)
@@ -1217,14 +946,7 @@ module PageObject
     #   # will generate 'circle_element', and 'circle?' methods
     #
     # @param [Symbol] the name used for the generated methods
-    # @param [Hash] identifier how we find a svg.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find a svg.
     # @param optional block to be invoked when element method is called
     #
     def svg(name, identifier={:index => 0}, &block)
@@ -1242,14 +964,7 @@ module PageObject
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Symbol] the name of the tag for the element
-    # @param [Hash] identifier how we find an element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an element.
     # @param optional block to be invoked when element method is called
     #
     def element(name, tag=:element, identifier={ :index => 0 }, &block)
@@ -1310,14 +1025,7 @@ module PageObject
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Symbol] the name of the tag for the element
-    # @param [Hash] identifier how we find an element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an element.
     # @param optional block to be invoked when element method is called
     #
     def elements(name, tag=:element, identifier={:index => 0}, &block)
@@ -1340,18 +1048,11 @@ module PageObject
     #
     # @example
     #   page_section(:navigation_bar, NavigationBar, :id => 'nav-bar')
-    #   # will generate 'navigation_bar' and 'navigation_bar?'
+    #   # will generate 'navigation_bar'
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Class] the class to instantiate for the element
-    # @param [Hash] identifier how we find an element.  You can use multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an element.
     #
     def page_section(name, section_class, identifier)
       define_method(name) do
@@ -1368,14 +1069,7 @@ module PageObject
     #
     # @param [Symbol] the name used for the generated method
     # @param [Class] the class to instantiate for each element
-    # @param [Hash] identifier how we find an element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an element.
     #
     def page_sections(name, section_class, identifier)
       define_method(name) do
@@ -1395,14 +1089,7 @@ module PageObject
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Symbol] the name of the tag for the element
-    # @param [Hash] identifier how we find an element.  You can use a multiple parameters
-    #   by combining of any of the following except xpath.  The valid keys are:
-    #   * :class => Watir and Selenium
-    #   * :css => Watir and Selenium
-    #   * :id => Watir and Selenium
-    #   * :index => Watir and Selenium
-    #   * :name => Watir and Selenium
-    #   * :xpath => Watir and Selenium
+    # @param [Hash] identifier how we find an element.
     # @param optional block to be invoked when element method is called
     #
     LocatorGenerator::BASIC_ELEMENTS.each do |tag|