RubyGems - page-object - Versions diffs - 0.6.9 → 0.7.0 - Mend

page-object 0.6.9 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

data/.rvmrc +1 -1
data/ChangeLog +9 -0
data/Guardfile +4 -5
data/cucumber.yml +1 -0
data/features/html/indexed_property.html +38 -0
data/features/indexed_property.feature +83 -0
data/features/step_definitions/indexed_property_steps.rb +79 -0
data/features/support/url_helper.rb +4 -0
data/features/table.feature +17 -1
data/lib/page-object.rb +7 -2
data/lib/page-object/accessors.rb +43 -14
data/lib/page-object/indexed_properties.rb +37 -0
data/lib/page-object/nested_elements.rb +1 -1
data/lib/page-object/page_factory.rb +15 -0
data/lib/page-object/platforms/selenium_webdriver/table.rb +2 -2
data/lib/page-object/platforms/selenium_webdriver/table_row.rb +2 -1
data/lib/page-object/platforms/watir_webdriver/table.rb +4 -2
data/lib/page-object/platforms/watir_webdriver/table_row.rb +2 -1
data/lib/page-object/version.rb +1 -1
data/page-object.gemspec +1 -1
data/spec/page-object/page_factory_spec.rb +20 -0
data/spec/page-object/watir_accessors_spec.rb +28 -20
metadata +59 -16

data/.rvmrc CHANGED

	@@ -1 +1 @@
1	- rvm 1.9.3-p0@page-object --create
1	+ rvm 1.9.3-p194@page-object --create

data/ChangeLog CHANGED

@@ -1,3 +1,12 @@
+=== Version 0.7.0 / 2012-6-30
+* Enhancements
+  * Updated Table [] method to return a row that has matching partial text in any column (Thanks George Shakhnazaryan)
+  * Updated TableRow [] method to return column that matching partial text in any column (Thanks George Shakhnazaryan)
+  * Added if_page to PageFactory (Thanks Gregory Shayko)
+  * Added index_property for accessing sets of related fields (Thanks robkid)
+  * Updated to use selenium-webdriver 2.24.0
 === Version 0.6.9 / 2012-6-12
 * Enhancements
   * Added select_value method to SelectList

data/Guardfile CHANGED

@@ -1,7 +1,6 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-features_to_run = 'features'
 guard 'rspec', :cli => '--color --format Fuubar' do
   watch(%r{^spec/.+_spec\.rb$})
@@ -12,10 +11,10 @@ guard 'rspec', :cli => '--color --format Fuubar' do
   watch('spec/spec_helper.rb')  { "spec" }
 end
-guard 'cucumber', :notification => true, :all_after_pass => false, :all_on_start => false, :cli => '--profile default'  do
+guard 'cucumber', :notification => true, :all_after_pass => false, :all_on_start => false, :cli => '--profile focus'  do
   watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { features_to_run }
+  watch(%r{^features/support/.+$})          { features }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
-  watch(%r{^lib/.+\.rb$})                   { features_to_run }
-  watch(%r{^cucumber.yml$})                 { features_to_run }
+  watch(%r{^lib/.+\.rb$})                   { features }
+  watch(%r{^cucumber.yml$})                 { features }
 end

data/cucumber.yml CHANGED

@@ -5,4 +5,5 @@ std_opts = "--no-source --color --format Cucumber::Formatter::Fuubar"
 default: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
 watir: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
 selenium: DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only
+focus:  DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only --tags @focus

data/features/html/indexed_property.html ADDED

@@ -0,0 +1,38 @@
+<html>
+<head>
+    <title>Indexed Property Page</title>
+</head>
+<body>
+    <form method="get" action="success.html">
+        <table id="table_id" name align="table_name" class="table_class" border="1">
+            <tr>
+                <td><input type="text" id="table[123].text" name="tableName[123].text" size="20"/></td>
+                <td><input type="radio" id="table[123].radio" value="123"/></td>
+                <td><input type="checkbox" id="table[123].check" value="1"/></td>
+                <td><textarea id="table[123].area" rows="2" cols="20"></textarea></td>
+                <td><input id="table[123].button" type="submit" value="Click 123"/></td>
+            </tr>
+            <tr>
+                <td><input type="text" id="table[foo].text" name="tableName[foo].text" size="20"/></td>
+                <td><input type="radio" id="table[foo].radio" value="foo"/></td>
+                <td><input type="checkbox" id="table[foo].check" value="2"/></td>
+                <td><textarea id="table[foo].area" rows="2" cols="20"></textarea></td>
+                <td><input id="table[foo].button" type="submit" value="Click foo"/></td>
+            </tr>
+            <tr>
+                <td><input type="text" id="table[12test].text" name="tableName[12test].text" size="20"/></td>
+                <td><input type="radio" id="table[12test].radio" value="12test"/></td>
+                <td><input type="checkbox" id="table[12test].check" value="3"/></td>
+                <td><textarea id="table[12test].area" rows="2" cols="20"></textarea></td>
+                <td><input id="table[12test].button" type="submit" value="Click 12test"/></td>
+            </tr>
+        </table>
+        <div>
+            <input type="text" id="nottable[123].text" size="20"/><br/>
+            <input type="text" id="nottable[foo].text" size="20"/><br/>
+            <input type="text" id="nottable[12test].text" size="20"/>
+        </div>
+    </form>
+</body>
+</html>

data/features/indexed_property.feature ADDED

@@ -0,0 +1,83 @@
+Feature: Indexed Property
+  In order to interact with recurring sequences of elements with an index
+  Testers will need access and interrogation ability
+  Background:
+    Given I am on the indexed property page
+  Scenario Outline: Locating indexed text fields in a table on the Page by id
+    When I search for the elements for index "<index>"
+    And I type "I found it" into the table's indexed text field by id
+    Then The table's indexed text field by id should contain "I found it"
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed text fields in a table on the Page by name
+    When I search for the elements for index "<index>"
+    And I type "I found it" into the table's indexed text field by name
+    Then The table's indexed text field by name should contain "I found it"
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed radio buttons in a table on the Page
+    When I search for the elements for index "<index>"
+    And I select the indexed radio button
+    Then The indexed radio button should be selected
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed checkboxes in a table on the Page
+    When I search for the elements for index "<index>"
+    And I check the indexed checkbox
+    Then The indexed checkbox should be checked
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed text areas in a table on the Page
+    When I search for the elements for index "<index>"
+    And I type "I found it" into the table's indexed text area
+    Then The table's indexed text area should contain "I found it"
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed buttons in a table on the Page
+    When I search for the elements for index "<index>"
+    Then I should see that the indexed button exists
+    And I should be able to click the indexed button
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |
+  Scenario Outline: Locating indexed text fields outside a table on the Page
+    When I search for the elements for index "<index>"
+    And I type "I found it" into the regular indexed text field by id
+    Then The regular indexed text field by id should contain "I found it"
+  Examples:
+    | index  |
+    | foo    |
+    | 123    |
+    | 12test |

data/features/step_definitions/indexed_property_steps.rb ADDED

@@ -0,0 +1,79 @@
+class IndexedPropertyPage
+  include PageObject
+  indexed_property :table, [[:text_field, :text, {:id => 'table[%s].text'}],
+                            [:text_field, :text_name, {:name => 'tableName[%s].text'}],
+                            [:radio_button, :radio, {:id => 'table[%s].radio'}],
+                            [:checkbox, :check, {:id => 'table[%s].check'}],
+                            [:text_area, :area, {:id => 'table[%s].area'}],
+                            [:button, :button, {:id => 'table[%s].button'}]]
+  indexed_property :nottable, [[:text_field, :text, {:id => 'nottable[%s].text'}]]
+end
+Given /^I am on the indexed property page$/ do
+  @page = IndexedPropertyPage.new(@browser)
+  @page.navigate_to(UrlHelper.indexed)
+end
+When /^I search for the elements for index "([^\"]*)"$/ do |index|
+  @index = index
+end
+Then /^I type "([^\"]*)" into the table's indexed text field by id$/ do |val|
+  @page.table[@index].text = val
+end
+Then /^The table's indexed text field by id should contain "([^\"]*)"$/ do |val|
+  @page.table[@index].text.should == val
+end
+Then /^I type "([^\"]*)" into the table's indexed text field by name$/ do |val|
+  @page.table[@index].text_name = val
+end
+Then /^The table's indexed text field by name should contain "([^\"]*)"$/ do |val|
+  @page.table[@index].text_name.should == val
+end
+Then /^I select the indexed radio button$/ do
+  @page.table[@index].select_radio
+end
+Then /^The indexed radio button should be selected$/ do
+  @page.table[@index].radio_selected?.should == true
+end
+Then /^I check the indexed checkbox$/ do
+  @page.table[@index].check_check
+end
+Then /^The indexed checkbox should be checked$/ do
+  @page.table[@index].check_checked?.should == true
+end
+Then /^I type "([^\"]*)" into the table's indexed text area$/ do |val|
+  @page.table[@index].area = val
+end
+Then /^The table's indexed text area should contain "([^\"]*)"$/ do |val|
+  @page.table[@index].area.should == val
+end
+Then /^I should see that the indexed button exists$/ do
+  @page.table[@index].button?.should == true
+end
+Then /^I should be able to click the indexed button$/ do
+  @page.table[@index].button
+end
+Then /^I type "([^\"]*)" into the regular indexed text field by id$/ do |val|
+  @page.nottable[@index].text = val
+end
+Then /^The regular indexed text field by id should contain "([^\"]*)"$/ do |val|
+  @page.nottable[@index].text.should == val
+end

data/features/support/url_helper.rb CHANGED

@@ -40,5 +40,9 @@ module UrlHelper
     def multi
       "#{files}/multi_elements.html"
     end
+    def indexed
+      "#{files}/indexed_property.html"
+    end
   end
 end

data/features/table.feature CHANGED

@@ -26,13 +26,29 @@ Feature: Table
     And the data for the first row should be "Data1" and "Data2"
     And the data for the last row should be "Data3" and "Data4"
-  Scenario: Retrieve data from a table using the row header
+  Scenario: Retrieve data from a table using a row header
     When I retrieve a table element
     Then the data for row "Data3" should be "Data3" and "Data4"
+  Scenario: Retrieve data from a table using a partial row header
+    When I retrieve a table element
+    Then the data for row "ata3" should be "Data3" and "Data4"
+  Scenario: Retrieve data from a table using a row header in the 2nd column
+    When I retrieve a table element
+    Then the data for row "Data4" should be "Data3" and "Data4"
+  Scenario: Retrieve data from a table using a partial row header in the 2nd column
+    When I retrieve a table element
+    Then the data for row "ata4" should be "Data3" and "Data4"
   Scenario: Retrieve data from a table using a column header
     When I retrieve a table element
     Then the data for column "Data2" and row "2" should be "Data4"
+  Scenario: Retrieve data from a table using a partial column header
+    When I retrieve a table element
+    Then the data for column "ata2" and row "2" should be "Data4"
   Scenario: Retrieve data from a table using both headers
     When I retrieve a table element

data/lib/page-object.rb CHANGED

@@ -5,6 +5,7 @@ require 'page-object/element_locators'
 require 'page-object/nested_elements'
 require 'page-object/page_populator'
 require 'page-object/javascript_framework_facade'
+require 'page-object/indexed_properties'
 require 'selenium/webdriver/common/error'
 #
@@ -53,12 +54,16 @@ module PageObject
   # @param [bool] open the page if page_url is set
   #
   def initialize(browser, visit=false)
-    @browser = browser
-    include_platform_driver(browser)
+    initialize_browser(browser)
     goto if visit && respond_to?(:goto)
     initialize_page if respond_to?(:initialize_page)
   end
+  def initialize_browser(browser)
+    @browser = browser
+    include_platform_driver(browser)
+  end
   # @private
   def self.included(cls)
     cls.extend PageObject::Accessors

data/lib/page-object/accessors.rb CHANGED

@@ -34,10 +34,10 @@ module PageObject
     # @example Specify 'Google' as the expected title of a page
     #   expected_title "Google"
     #   page.has_expected_title?
-    #
+    #
     def expected_title(expected_title)
       define_method("has_expected_title?") do
-        has_expected_title = expected_title.kind_of?(Regexp) ? expected_title =~ title : expected_title == title
+        has_expected_title = expected_title === title
         raise "Expected title '#{expected_title}' instead of '#{title}'" unless has_expected_title
         has_expected_title
       end
@@ -59,7 +59,7 @@ module PageObject
         self.respond_to? "#{element_name}_element" and self.send("#{element_name}_element").when_present timeout
       end
     end
     #
     # Identify an element as existing within a frame or iframe.  A frame parameter
     # is passed to the block and must be passed to the other calls to PageObject.
@@ -88,8 +88,8 @@ module PageObject
     # another to retrieve text from a text field, another to return the text
     # field element, another to check the text field's existence.
     #
-    # @example
-    #   text_field(:first_name, :id => "first_name")
+    # @example
+    #   text_field(:first_name, :id => "first_name")
     #   # will generate 'first_name', 'first_name=', 'first_name_element',
     #   # 'first_name?' methods
     #
@@ -126,7 +126,7 @@ module PageObject
       end
       alias_method "#{name}_text_field".to_sym, "#{name}_element".to_sym
     end
     #
     # adds three methods to the page object - one to get the text from a hidden field,
     # another to retrieve the hidden field element, and another to check the hidden
@@ -207,7 +207,7 @@ module PageObject
     #
     # adds four methods - one to select an item in a drop-down,
     # another to fetch the currently selected item text, another
-    # to retrieve the select list element, and another to check the
+    # to retrieve the select list element, and another to check the
     # drop down's existence.
     #
     # @example
@@ -295,7 +295,7 @@ module PageObject
     #
     # @example
     #   checkbox(:active, :name => "is_active")
-    #   # will generate 'check_active', 'uncheck_active', 'active_checked?',
+    #   # will generate 'check_active', 'uncheck_active', 'active_checked?',
     #   # 'active_element', and 'active?' methods
     #
     # @param [Symbol] the name used for the generated methods
@@ -335,14 +335,14 @@ module PageObject
     #
     # adds five methods - one to select, another to clear,
-    # another to return if a radio button is selected,
+    # another to return if a radio button is selected,
     # another method to return a PageObject::Elements::RadioButton
     # object representing the radio button element, and another to check
     # the radio button's existence.
     #
     # @example
     #   radio_button(:north, :id => "north")
-    #   # will generate 'select_north', 'clear_north', 'north_selected?',
+    #   # will generate 'select_north', 'clear_north', 'north_selected?',
     #   # 'north_element', and 'north?' methods
     #
     # @param [Symbol] the name used for the generated methods
@@ -712,9 +712,9 @@ module PageObject
       end
       alias_method "#{name}_ordered_list".to_sym, "#{name}_element".to_sym
     end
     #
-    # adds three methods - one to retrieve the text of a h1 element, another to
+    # adds three methods - one to retrieve the text of a h1 element, another to
     # retrieve a h1 element, and another to check for it's existence.
     #
     # @example
@@ -746,7 +746,7 @@ module PageObject
       end
       alias_method "#{name}_h1".to_sym, "#{name}_element".to_sym
     end
     #
     # adds three methods - one to retrieve the text of a h2 element, another
     # to retrieve a h2 element, and another to check for it's existence.
@@ -1049,8 +1049,37 @@ module PageObject
       end
       define_method("#{name}?") do
         self.send("#{name}_element").exists?
-      end
+      end
     end
+    #
+    # adds a method that will return an indexed property.  The property will respond to
+    # the [] method with an object that has a set of normal page_object properties that
+    # correspond to the definitions included in the identifier_list parameter, with the
+    # "what" of the "how and what" substituted based on the index provided to the []
+    # method.
+    #
+    # @example
+    #   indexed_property(:title, [
+    #     [:text_field,  :field_1,   :id => 'table[%s].field_1'],
+    #     [:button,      :button_1,  :id => 'table[%s].button_1'],
+    #     [:text_field,  :field_2,   :name => 'table[%s].field_2']
+    #   ])
+    #   # will generate a title method that responds to [].  title['foo'] will return an object
+    #   # that responds to the normal methods expected for two text_fields and a button with the
+    #   # given names, using the given how and what with 'foo' substituted for the %s.  title[123]
+    #   # will do the same, using the integer 123 instead.
+    #
+    # @param [Symbol] the name used for the generated method
+    # @param [Array] definitions an array of definitions to define on the indexed property.  Each
+    #   entry in the array should contain two symbols and a hash, corresponding to one of the standard
+    #   page_object properties with a single substitution marker in each value in the hash,
+    #   e.g. [:text_field, :field_1, :id => 'table[%s].field_1']
+    #
+    def indexed_property (name, identifier_list)
+      define_method("#{name}") do
+        IndexedProperties::TableOfElements.new(@browser, identifier_list)
+      end
+    end
   end
 end

data/lib/page-object/indexed_properties.rb ADDED

@@ -0,0 +1,37 @@
+module PageObject
+  module IndexedProperties
+    class RowOfElements
+      include PageObject
+      include LoadsPlatform
+      extend Accessors
+      def initialize (browser, index, identifier_list)
+        initialize_browser(browser)
+        identifier_list.each do |identifier|
+          type = identifier[0]
+          name = identifier[1]
+          how_and_what = identifier[2].clone # Cannot modify the original...
+          how_and_what.each do |key, value|
+            how_and_what[key] = value % index
+          end
+          self.class.send type, name, how_and_what
+        end
+      end
+    end
+    class TableOfElements
+      include PageObject
+      include LoadsPlatform
+      def initialize (browser, identifier_list)
+        initialize_browser(browser)
+        @identifier_list = identifier_list
+      end
+      def [] (index)
+        RowOfElements.new(@browser, index, @identifier_list)
+      end
+    end
+  end
+end

data/lib/page-object/nested_elements.rb CHANGED

@@ -54,7 +54,7 @@ module PageObject
     end
     def checkbox_elements(identifier={:index => 0})
-      @platform.checkboxs_for(identifier)
+      @platform.checkboxes_for(identifier)
     end
     def radio_button_element(identifier={:index => 0})

data/lib/page-object/page_factory.rb CHANGED

@@ -62,6 +62,21 @@ module PageObject
     # Support 'on' for readability of usage
     alias_method :on, :on_page
+    #
+    # Create a page object if and only if the current page is the same page to be created
+    #
+    # @param [PageObject]  a class that has included the PageObject module
+    # @param [block]  an optional block to be called
+    # @return [PageObject] the newly created page object
+    #
+    def if_page(page_class, &block)
+      return @current_page unless @current_page.class == page_class
+      on_page(page_class, false, &block)
+    end
+    # Support 'if' for readability of usage
+    alias_method :if, :if_page
     #
     # Navigate to a specific page following a predefined path.

data/lib/page-object/platforms/selenium_webdriver/table.rb CHANGED

@@ -6,7 +6,7 @@ module PageObject
         #
         # Return the PageObject::Elements::TableRow for the index provided.  Index
         # is zero based.  If the index provided is a String then it
-        # will be matched with the text from the first column.
+        # will be matched with the text from any column. The text can be a substring of the full column text.
         #
         # @return [PageObject::Elements::TableRow]
         #
@@ -37,7 +37,7 @@ module PageObject
         def find_index_by_title(row_title, eles)
           eles.find_index do |row|
             columns = row.find_elements(:xpath, ".//child::td|th")
-            columns.first.text == row_title
+            columns.any? { |col| col.text.include? row_title }
           end
         end

data/lib/page-object/platforms/selenium_webdriver/table_row.rb CHANGED

@@ -8,6 +8,7 @@ module PageObject
         # Return the PageObject::Elements::TableCell for the index provided.  Index
         # is zero based.  If the index provided is a String then it
         # will be matched with the text from the columns in the first row.
+        # The text can be a substring of the full column text.
         #
         def [](idx)
           els = table_cells
@@ -28,7 +29,7 @@ module PageObject
         def find_index_by_title(title)
           table = parent
           table = table.parent if parent.element.tag_name == 'tbody'
-          table[0].find_index {|column| column.text == title}
+          table[0].find_index { |column| column.text.include? title }
         end
         def table_cells

data/lib/page-object/platforms/watir_webdriver/table.rb CHANGED

@@ -7,7 +7,7 @@ module PageObject
         #
         # Return the PageObject::Elements::TableRow for the index provided.  Index
         # is zero based.  If the index provided is a String then it
-        # will be matched with the text from the first column.
+        # will be matched with the text from any column. The text can be a substring of the full column text.
         #
         # @return [PageObject::Elements::TableRow]
         #
@@ -27,7 +27,9 @@ module PageObject
         private
         def find_index_by_title(row_title)
-          element.rows.find_index {|row| row[0].text == row_title}
+          element.rows.find_index do |row|
+            row.cells.any? { |col| col.text.include? row_title }
+          end
         end
       end

data/lib/page-object/platforms/watir_webdriver/table_row.rb CHANGED

@@ -7,6 +7,7 @@ module PageObject
         # Return the PageObject::Elements::TableCell for the index provided.  Index
         # is zero based.  If the index provided is a String then it
         # will be matched with the text from the columns in the first row.
+        # The text can be a substring of the full column text.
         #
         def [](idx)
           idx = find_index_by_title(idx) if idx.kind_of?(String)
@@ -26,7 +27,7 @@ module PageObject
         def find_index_by_title(title)
           table = element.parent
           first_row = table[0]
-          first_row.cells.find_index {|column| column.text == title}
+          first_row.cells.find_index {|column| column.text.include? title }
         end
       end

data/lib/page-object/version.rb CHANGED

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
 end

data/page-object.gemspec CHANGED

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency 'watir-webdriver', '>= 0.6.1'
-  s.add_dependency 'selenium-webdriver', '>= 2.22.2'
+  s.add_dependency 'selenium-webdriver', '>= 2.24.0'
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '< 1.2.0'

data/spec/page-object/page_factory_spec.rb CHANGED

@@ -72,6 +72,26 @@ describe PageObject::PageFactory do
     current_page.should === page
   end
+  it "should not execute block if page is not @current_page" do
+    @world.instance_variable_set "@current_page", TestPageWithDirectUrl.new(@world.browser)
+    @world.if_page(FactoryTestPage) do |page|
+      fail
+    end
+  end
+  it "should return the @current_page if asking for another page" do
+    expected = TestPageWithDirectUrl.new(@world.browser)
+    @world.instance_variable_set "@current_page", expected
+    @world.if_page(FactoryTestPage).should == expected
+  end
+  it "should execute the block when we ask if it is the correct page" do
+    @world.instance_variable_set "@current_page", FactoryTestPage.new(@world.browser)
+    @world.if_page(FactoryTestPage) do |page|
+      page.should be_instance_of FactoryTestPage
+    end
+  end
   it "should raise an error when you do not provide a default route" do
     expect { PageObject::PageFactory.routes = {:another => []} }.to raise_error
   end

data/spec/page-object/watir_accessors_spec.rb CHANGED

@@ -119,7 +119,7 @@ describe PageObject::Accessors do
   let(:watir_browser) { mock_watir_browser }
   let(:watir_page_object) { WatirAccessorsTestPageObject.new(watir_browser) }
   let(:block_page_object) { WatirBlockPageObject.new(watir_browser) }
   context "goto a page" do
     it "should navigate to a page when requested" do
@@ -151,12 +151,20 @@ describe PageObject::Accessors do
   end
   context "validating the page title" do
     it "should validate the title" do
       watir_browser.should_receive(:title).and_return("Expected Title")
       watir_page_object.should have_expected_title
     end
+    it "should validate the by regexp" do
+      class RegexpExpectedTitle
+        include PageObject
+        expected_title /\w+ \w+/
+      end
+      watir_browser.should_receive(:title).and_return("Expected Title")
+      RegexpExpectedTitle.new(watir_browser).should have_expected_title
+    end
     it "should raise error when it does not have expected title" do
       watir_browser.should_receive(:title).twice.and_return("Not Expected")
       expect { watir_page_object.has_expected_title? }.to raise_error
@@ -351,7 +359,7 @@ describe PageObject::Accessors do
       mock_driver_for :audio
       default_identifier.default_el?
     end
   end
   context "link accessors" do
@@ -366,7 +374,7 @@ describe PageObject::Accessors do
         block_page_object.continue_element.should == "link"
       end
     end
     it "should select a link" do
       watir_browser.stub_chain(:link, :click)
       watir_page_object.google_search
@@ -531,7 +539,7 @@ describe PageObject::Accessors do
       watir_browser.should_receive(:set)
       watir_page_object.check_active
     end
     it "should clear a check box element" do
       watir_browser.should_receive(:checkbox).and_return(watir_browser)
       watir_browser.should_receive(:clear)
@@ -816,50 +824,50 @@ describe PageObject::Accessors do
       element.should be_instance_of PageObject::Elements::OrderedList
     end
   end
   describe "h1 accessors" do
     context "when called on a page object" do
       it "should generate accessor methods" do
         watir_page_object.should respond_to(:heading1)
         watir_page_object.should respond_to(:heading1_element)
       end
       it "should call a block on the element method when present" do
         block_page_object.heading1_element.should == "h1"
       end
     end
     it "should retrieve the text from the h1" do
       watir_browser.should_receive(:h1).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading1.should == "value"
+      watir_page_object.heading1.should == "value"
     end
     it "should retrieve the element from the page" do
       watir_browser.should_receive(:h1).and_return(watir_browser)
       element = watir_page_object.heading1_element
       element.should be_instance_of PageObject::Elements::Heading
     end
   end
   describe "h2 accessors" do
     context "when called on a page object" do
       it "should generate accessor methods" do
         watir_page_object.should respond_to(:heading2)
         watir_page_object.should respond_to(:heading2_element)
       end
       it "should call a block on the element method when present" do
         block_page_object.heading2_element.should == "h2"
       end
     end
     it "should retrieve the text from the h2" do
       watir_browser.should_receive(:h2).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading2.should == "value"
+      watir_page_object.heading2.should == "value"
     end
     it "should retrieve the element from the page" do
       watir_browser.should_receive(:h2).and_return(watir_browser)
       element = watir_page_object.heading2_element
@@ -882,7 +890,7 @@ describe PageObject::Accessors do
     it "should retrieve the text from the h3" do
       watir_browser.should_receive(:h3).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading3.should == "value"
+      watir_page_object.heading3.should == "value"
     end
     it "should retrieve the element from the page" do
@@ -907,7 +915,7 @@ describe PageObject::Accessors do
     it "should retrieve the text from the h4" do
       watir_browser.should_receive(:h4).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading4.should == "value"
+      watir_page_object.heading4.should == "value"
     end
     it "should retrieve the element from the page" do
@@ -932,7 +940,7 @@ describe PageObject::Accessors do
     it "should retrieve the text from the h5" do
       watir_browser.should_receive(:h5).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading5.should == "value"
+      watir_page_object.heading5.should == "value"
     end
     it "should retrieve the element from the page" do
@@ -957,7 +965,7 @@ describe PageObject::Accessors do
     it "should retrieve the text from the h6" do
       watir_browser.should_receive(:h6).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.heading6.should == "value"
+      watir_page_object.heading6.should == "value"
     end
     it "should retrieve the element from the page" do
@@ -983,7 +991,7 @@ describe PageObject::Accessors do
     it "should retrieve the text from the p" do
       watir_browser.should_receive(:p).and_return(watir_browser)
       watir_browser.should_receive(:text).and_return("value")
-      watir_page_object.first_para.should == "value"
+      watir_page_object.first_para.should == "value"
     end
     it "should retrieve the element from the page" do

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70157117515820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,31 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70157117515820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70157117515320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.22.2
+        version: 2.24.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157117515320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70157117514860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70157117514860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70157117514400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -54,10 +69,15 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70157117514400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70157117513940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70157117513940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70157117513480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70157117513480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
@@ -114,6 +144,7 @@ files:
 - features/html/iframes.html
 - features/html/images/circle.png
 - features/html/images/submit.gif
+- features/html/indexed_property.html
 - features/html/modal.html
 - features/html/modal_1.html
 - features/html/modal_2.html
@@ -126,6 +157,7 @@ files:
 - features/html/static_elements.html
 - features/html/success.html
 - features/image.feature
+- features/indexed_property.feature
 - features/javascript.feature
 - features/label.feature
 - features/link.feature
@@ -157,6 +189,7 @@ files:
 - features/step_definitions/headings_steps.rb
 - features/step_definitions/hidden_field_steps.rb
 - features/step_definitions/image_steps.rb
+- features/step_definitions/indexed_property_steps.rb
 - features/step_definitions/javascript_steps.rb
 - features/step_definitions/label_steps.rb
 - features/step_definitions/link_steps.rb
@@ -216,6 +249,7 @@ files:
 - lib/page-object/elements/text_area.rb
 - lib/page-object/elements/text_field.rb
 - lib/page-object/elements/unordered_list.rb
+- lib/page-object/indexed_properties.rb
 - lib/page-object/javascript/jquery.rb
 - lib/page-object/javascript/prototype.rb
 - lib/page-object/javascript/yui.rb
@@ -311,15 +345,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1451627293781447713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1451627293781447713
 requirements: []
 rubyforge_project: page-object
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Page Object DSL for browser testing
@@ -343,6 +383,7 @@ test_files:
 - features/html/iframes.html
 - features/html/images/circle.png
 - features/html/images/submit.gif
+- features/html/indexed_property.html
 - features/html/modal.html
 - features/html/modal_1.html
 - features/html/modal_2.html
@@ -355,6 +396,7 @@ test_files:
 - features/html/static_elements.html
 - features/html/success.html
 - features/image.feature
+- features/indexed_property.feature
 - features/javascript.feature
 - features/label.feature
 - features/link.feature
@@ -386,6 +428,7 @@ test_files:
 - features/step_definitions/headings_steps.rb
 - features/step_definitions/hidden_field_steps.rb
 - features/step_definitions/image_steps.rb
+- features/step_definitions/indexed_property_steps.rb
 - features/step_definitions/javascript_steps.rb
 - features/step_definitions/label_steps.rb
 - features/step_definitions/link_steps.rb