page-object 0.7.1 → 0.7.2

data/ChangeLog

@@ -1,3 +1,12 @@
+=== Version 0.7.2 / 2012-8-1
+* Enhancements
+  * Added ability to find list_item by :text
+  * Added support for the following new elements
+	Canvas
+	Audio
+  * Updated to use selenium-webdriver 2.25.0
+  * Updated to provide better support for table_row.find_index_by_title when tables have theads... (George Shakhnazaryan)
+
 === Version 0.7.1 / 2012-7-15
 * Enhancements
   * Added support for the following new elements

data/Guardfile

@@ -11,7 +11,7 @@ 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 focus'  do
+guard 'cucumber', :notification => true, :all_after_pass => false, :cli => '--profile focus'  do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { "features" }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/README.md

@@ -15,6 +15,8 @@ To see the changes from release to release please look at the [ChangeLog](https:
 
 To read about the motivation for this gem please read this [blog entry](http://www.cheezyworld.com/2010/11/19/ui-tests-introducing-a-simple-dsl/)
 
+There is a book that describes in detail how to use this gem and others to create a complete view of testing web and other types of applications.  The book is named [Cucumber & Cheese](http://leanpub.com/cucumber_and_cheese)
+
 ## Support
 
 If you need help using the page-object gem please ask your questions on [Stack Overflow](http://stackoverflow.com).  Please be sure to use the [page-object-gem](http://stackoverflow.com/questions/tagged/page-object-gem) tag.  If you wish to report an issue or request a new feature use the [github issue tracking page](http://github.com/cheezy/page-object/issues).

data/cucumber.yml

@@ -5,5 +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
+focus:  DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only --tags @focus
 

data/features/audio.feature

@@ -0,0 +1,50 @@
+Feature:  Support for the audio element
+
+  Background:
+    Given I am on the static elements page
+
+  Scenario: finding an audio element
+    When I retrieve the audio element
+    Then I should know it exists
+    And I should know it is visible
+
+  Scenario Outline: Locating an audio element on the page
+    When I search for the audio element by "<search_by>"
+    Then I should know it is visible
+
+  Examples:
+    | search_by |
+    | id        |
+    | class     |
+    | name      |
+    | xpath     |
+    | index     |
+
+  Scenario Outline: Locating audios using multiple parameters
+    When I search for the audio element by "<param1>" and "<param2>"
+    Then I should know it is visible
+
+  Examples:
+    | param1 | param2 |
+    | class  | index  |
+    | name   | index  |
+
+  Scenario: Should know if it is autoplay
+    When I retrieve the audio element
+    Then I should know the audio is not autoplay
+    
+  Scenario: Should know if the controls are displayed
+    When I retrieve the audio element
+    Then I should know that the controls are displayed
+
+  Scenario: Should know if it is paused
+    When I retrieve the audio element
+    Then I should know that the audio is paused
+
+  Scenario: Should know its duration
+    When I retrieve the audio element
+    Then I should know that the duration is greater than 74 seconds
+
+  Scenario: Should know its volume
+    When I retrieve the audio element
+    Then I should know that its volume is 1

data/features/canvas.feature

@@ -0,0 +1,36 @@
+Feature:  Support for the canvas element
+
+  Background:
+    Given I am on the static elements page
+
+  Scenario: Retrieve a canvas element
+    When I retrieve the canvas element
+    Then I should know it exists
+    And I should know it is visible
+
+  Scenario Outline: Locating a canvas on the page
+    When I search for the canvas by "<search_by>"
+    Then I should know it is visible
+
+  Examples:
+    | search_by |
+    | id        |
+    | class     |
+    | name      |
+    | xpath     |
+    | index     |
+
+  Scenario: Determining the width and height of the canvas
+    When I retrieve the canvas element
+    Then I should see that the canvas width is "200"
+    And I should see that the canvas height is "100"
+
+  Scenario Outline: Locating canvases using multiple parameters
+    When I search for the canvas element by "<param1>" and "<param2>"
+    Then I should know it is visible
+
+  Scenarios:
+    | param1 | param2 |
+    | class  | index  |
+    | name   | index  |
+

data/features/html/static_elements.html

@@ -31,6 +31,22 @@
       <area shape="circle" coords="90,58,3" href="mercur.html"/>
       <area shape="circle" coords="124,58,8" href="venus.html"/>
     </map>
+    
+    <canvas id="canvas" name="canvas" class="canvas" width="200" height="100"></canvas>
+    <script type="text/javascript">
+      var c=document.getElementById("myCanvas");
+      var ctx=c.getContext("2d");
+      ctx.fillStyle="#FF0000";
+      ctx.fillRect(0,0,150,75);
+    </script>
+
+    <audio controls id="audio" name="audio" class="audio">
+      <source src="http://media.w3.org/2010/07/bunny/04-Death_Becomes_Fur.mp4"
+              type='audio/mp4'>
+        <source src="http://media.w3.org/2010/07/bunny/04-Death_Becomes_Fur.oga"
+                type='audio/ogg; codecs=vorbis'>
+          <p>Your user agent does not support the HTML5 Audio element.</p>
+    </audio>
 
     <a href="success.html" id="link_id" name="link_name" class="link_class" title="link_title">Google Search</a>
 
@@ -62,6 +78,25 @@
         </tr>
     </table>
 
+    <table id='table_with_thead_id' border='1'>
+      <thead>
+        <tr>
+          <th>Col1</th>
+          <th>Col2</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>Data1</td>
+          <td>Data2</td>
+        </tr>
+        <tr>
+          <td>Data3</td>
+          <td>Data4</td>
+        </tr>
+      </tbody>
+    </table>
+
     <form method="get" action="success.html">
         <input id='button_id' name='button_name' class='button_class' type="submit" value="Click Me"/>
         <input id='button_image_id' type='image' src='images/submit.gif' alt='Submit'/>

data/features/list_item.feature

@@ -18,6 +18,7 @@ Feature: List item
     | xpath     |
     | index     |
     | name      |
+    | text      |
 
   Scenario Outline: Locating list items using multiple parameters
     When I search for the list item by "<param1>" and "<param2>"

data/features/step_definitions/audio_steps.rb

@@ -0,0 +1,27 @@
+When /^I search for the audio element by "([^\"]*)"$/ do |how|
+  @element = @page.send "audio_#{how}_element"
+end
+
+When /^I search for the audio element by "([^"]*)" and "([^"]*)"$/ do |param1, param2|
+  @element = @page.send "audio_#{param1}_#{param2}_element"
+end
+
+Then /^I should know the audio is not autoplay$/ do
+  @element.should_not be_autoplay
+end
+
+Then /^I should know that the controls are displayed$/ do
+  @element.should have_controls
+end
+
+Then /^I should know that the audio is paused$/ do
+  @element.should be_paused
+end
+
+Then /^I should know that the duration is greater than (\d+) seconds$/ do |duration|
+  @element.duration.should > duration.to_f
+end
+
+Then /^I should know that its volume is (\d+)$/ do |volume|
+  @element.volume.should == volume.to_i
+end

data/features/step_definitions/canvas_steps.rb

@@ -0,0 +1,15 @@
+When /^I search for the canvas by "([^\"]*)"$/ do |how|
+  @element = @page.send "canvas_#{how}_element"
+end
+
+Then /^I should see that the canvas width is "([^\"]*)"$/ do |width|
+  @element.width.should == width.to_i
+end
+
+Then /^I should see that the canvas height is "([^\"]*)"$/ do |height|
+  @element.height.should == height.to_i
+end
+
+When /^I search for the canvas element by "([^"]*)" and "([^"]*)"$/ do |param1, param2|
+  @element = @page.send "canvas_#{param1}_#{param2}_element"
+end

data/features/step_definitions/element_steps.rb

@@ -30,6 +30,10 @@ When /^I retrieve a table element$/ do
   @element = @page.table_id_element
 end
 
+When /^I retrieve a table with thead element$/ do
+  @element = @page.table_with_thead_id_element
+end
+
 When /^I retrieve a button element$/ do
   @element = @page.button_id_element
 end
@@ -46,6 +50,14 @@ When /^I retrieve the area element$/ do
   @element = @page.area_id_element
 end
 
+When /^I retrieve the canvas element$/ do
+  @element = @page.canvas_id_element
+end
+
+When /^I retrieve the audio element$/ do
+  @element = @page.audio_id_element
+end
+
 When /^I locate the form$/ do
   @element = @page.form_id_element
 end

data/features/support/page.rb

@@ -116,6 +116,7 @@ class Page
   table(:table_xpath, :xpath => '//table')
   table(:table_class_index, :class => "table_class", :index => 0)
   table(:table_name_index, :name => "table_name", :index => 0)
+  table(:table_with_thead_id, :id => 'table_with_thead_id')
 
   cell(:cell_id, :id => 'cell_id')
   cell(:cell_name, :name => 'cell_name')
@@ -176,6 +177,7 @@ class Page
   list_item(:li_name, :name => 'li_name')
   list_item(:li_class, :class => 'li_class')
   list_item(:li_index, :index => 0)
+  list_item(:li_text, :text => 'Item One')
   list_item(:li_xpath, :xpath => '//li[1]')
   list_item(:li_class_index, :class => "li_class", :index => 0)
   list_item(:li_name_index, :name => "li_name", :index => 0)
@@ -285,6 +287,22 @@ class Page
   area(:area_class_index, :class => 'area', :index => 0)
   area(:area_name_index, :name => 'area', :index => 0)
 
+  canvas(:canvas_id, :id => 'canvas')
+  canvas(:canvas_name, :name => 'canvas')
+  canvas(:canvas_class, :class => 'canvas')
+  canvas(:canvas_index, :index => 0)
+  canvas(:canvas_xpath, :xpath => '//canvas')
+  canvas(:canvas_class_index, :class => 'canvas', :index => 0)
+  canvas(:canvas_name_index, :name => 'canvas', :index => 0)
+
+  audio(:audio_id, :id => 'audio')
+  audio(:audio_name, :name => 'audio')
+  audio(:audio_class, :class => 'audio')
+  audio(:audio_index, :index => 0)
+  audio(:audio_xpath, :xpath => '//audio')
+  audio(:audio_class_index, :class => 'audio', :index => 0)
+  audio(:audio_name_index, :name => 'audio', :index => 0)
+  
   element(:article_id, :article, :id => 'article_id')
   element(:header_id, :header, :id => 'header_id')
   element(:footer_id, :footer, :id => 'footer_id')

data/features/table.feature

@@ -46,6 +46,14 @@ Feature: Table
     When I retrieve a table element
     Then the data for column "Data2" and row "2" should be "Data4"
 
+  Scenario: Retrieve data from a table with a thead using a column header
+    When I retrieve a table with thead element
+    Then the data for column "Col1" and row "2" should be "Data1"
+
+  Scenario: Retrieve data from the first row of a table with a thead using a column header
+    When I retrieve a table with thead element
+    Then the data for column "Col1" and row "1" should be "Col1"
+
   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"

data/lib/page-object/accessors.rb

@@ -643,6 +643,7 @@ module PageObject
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
@@ -1067,6 +1068,64 @@ module PageObject
       end
     end
 
+    #
+    # adds two methods - one to return the canvas element and another to check
+    # the canvas's existence.
+    #
+    # @example
+    #   canvas(:my_canvas, :id => 'canvas_id')
+    #   # 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 paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    # @param optional block to be invoked when element method is called
+    #
+    def canvas(name, identifier={:index => 0}, &block)
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        platform.canvas_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exists? if block_given?
+        platform.canvas_for(identifier.clone).exists?
+      end
+    end
+
+    #
+    # adds two methods - one to return the audio element and another to check
+    # the audio's existence.
+    #
+    # @example
+    #   audio(:acdc, :id => 'audio_id')
+    #   # 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 paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    # @param optional block to be invoked when element method is called
+    #
+    def audio(name, identifier={:index => 0}, &block)
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        platform.audio_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exists? if block_given?
+        platform.audio_for(identifier.clone).exists?
+      end
+    end
+
     #
     # adds three methods - one to retrieve the text of an element, another
     # to retrieve an element, and another to check the element's existence.

data/lib/page-object/element_locators.rb

@@ -911,6 +911,66 @@ module PageObject
       platform.areas_for(identifier.clone)
     end
 
+    #
+    # Finds a canvas
+    #
+    # @param [Hash] identifier how we find a canvas.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    def canvas_element(identifier={:index => 0})
+      platform.canvas_for(identifier.clone)
+    end
+
+    #
+    # Finds all canvases that match the provided identifier
+    #
+    # @param [Hash] identifier how we find a canvas.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  It defaults to and empty Hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    def canvas_elements(identifier={})
+      platform.canvases_for(identifier.clone)
+    end
+
+    #
+    # Finds an audio element
+    #
+    # @param [Hash] identifier how we find an audio.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    def audio_element(identifier={:index => 0})
+      platform.audio_for(identifier.clone)
+    end
+
+    #
+    # Finds all audio elements that match the provided identifier
+    #
+    # @param [Hash] identifier how we find an audio element.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  It defaults to and empty Hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    def audio_elements(identifier={})
+      platform.audios_for(identifier.clone)
+    end
+
     #
     # Finds an element
     #

data/lib/page-object/elements.rb

@@ -51,4 +51,7 @@ require 'page-object/elements/paragraph'
 require 'page-object/elements/label'
 require 'page-object/elements/file_field'
 require 'page-object/elements/area'
+require 'page-object/elements/canvas'
+require 'page-object/elements/audio'
+
 

data/lib/page-object/elements/audio.rb

@@ -0,0 +1,31 @@
+
+module PageObject
+  module Elements
+    class Audio < Element
+
+      def autoplay?
+        attribute(:autoplay)
+      end
+
+      def has_controls?
+        attribute(:controls)
+      end
+
+      def paused?
+        attribute(:paused)
+      end
+
+      def duration
+        duration = attribute(:duration)
+        return duration.to_f if duration
+      end
+
+      def volume
+        volume = attribute(:volume)
+        return volume.to_i if volume
+      end
+      
+    end
+    ::PageObject::Elements.type_to_class[:audio] = ::PageObject::Elements::Audio
+  end
+end

data/lib/page-object/elements/canvas.rb

@@ -0,0 +1,23 @@
+
+module PageObject
+  module Elements
+    class Canvas < Element
+      #
+      # return the width of the canvas
+      #
+      def width
+        attribute(:width).to_i
+      end
+
+      #
+      # return the height of the canvas
+      #
+      def height
+        attribute(:height).to_i
+      end
+      
+    end
+    ::PageObject::Elements.type_to_class[:canvas] = ::PageObject::Elements::Canvas
+  end
+end
+

data/lib/page-object/elements/element.rb

@@ -105,7 +105,7 @@ module PageObject
       protected
 
       def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

data/lib/page-object/elements/list_item.rb

@@ -2,6 +2,15 @@ module PageObject
   module Elements
     class ListItem < Element
 
+      protected
+
+      def self.watir_finders
+        super + [:text]
+      end
+
+      def self.selenium_finders
+        super + [:text]
+      end
     end
 
     ::PageObject::Elements.tag_to_class[:li] = ::PageObject::Elements::ListItem

data/lib/page-object/nested_elements.rb

@@ -204,5 +204,29 @@ module PageObject
     def file_field_element(identifier={:index => 0})
       @platform.file_field_for(identifier)
     end
+
+    def area_element(identifier={:index => 0})
+      @platform.area_for(identifier)
+    end
+
+    def area_elements(identifier={:index => 0})
+      @platform.areas_for(identifier)
+    end
+
+    def canvas_element(identifier={:index => 0})
+      @platform.canvas_for(identifier)
+    end
+
+    def canvas_elements(identifier={:index => 0})
+      @platform.canvases_for(identifier)
+    end
+
+    def audio_element(identifier={:index => 0})
+      @platform.audio_for(identifier)
+    end
+
+    def audio_elements(identifier={:index => 0})
+      @platform.audios_for(identifier)
+    end
   end
 end

data/lib/page-object/platforms/selenium_webdriver/page_object.rb

@@ -885,6 +885,34 @@ module PageObject
         def areas_for(identifier)
           find_selenium_elements(identifier, Elements::Area, 'area')
         end
+
+        #
+        # platform method to retrieve a canvas element
+        #
+        def canvas_for(identifier)
+          find_selenium_element(identifier, Elements::Canvas, 'canvas')
+        end
+
+        #
+        # platform method to return an array of canvas elements
+        #
+        def canvases_for(identifier)
+          find_selenium_elements(identifier, Elements::Canvas, 'canvas')
+        end
+        
+        #
+        # platform method to retrieve an audio element
+        #
+        def audio_for(identifier)
+          find_selenium_element(identifier, Elements::Audio, 'audio')
+        end
+
+        #
+        # platform method to return an array of audio elements
+        #
+        def audios_for(identifier)
+          find_selenium_elements(identifier, Elements::Audio, 'audio')
+        end
         
         #
         # platform method to retrieve a generic element
@@ -975,7 +1003,7 @@ module PageObject
           return false if identifier[:label]
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'text'
-          return false if identifier[:text] and ['div', 'span', 'td', 'label'].include? tag
+          return false if identifier[:text] and ['div', 'span', 'td', 'label', 'li'].include? tag
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'text'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'file'
           return false if identifier[:title] and tag == 'a'

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

@@ -28,7 +28,8 @@ module PageObject
 
         def find_index_by_title(title)
           table = parent
-          table = table.parent if parent.element.tag_name == 'tbody'
+          parent_tag_name = parent.element.tag_name
+          table = table.parent if (parent_tag_name == 'tbody' || parent_tag_name == 'thead')
           table[0].find_index { |column| column.text.include? title }
         end
 

data/lib/page-object/platforms/watir_webdriver/page_object.rb

@@ -827,6 +827,34 @@ module PageObject
           find_watir_elements("areas(identifier)", Elements::Area, identifier, 'area')
         end
 
+        #
+        # platform method to retrieve a canvas element
+        #
+        def canvas_for(identifier)
+          find_watir_element("canvas(identifier)", Elements::Canvas, identifier, 'canvas')
+        end
+
+        #
+        # platform method to retrieve an array of canvas elements
+        #
+        def canvases_for(identifier)
+          find_watir_elements("canvases(identifier)", Elements::Canvas, identifier, 'canvas')
+        end
+
+        #
+        # platform method to retrieve an audio element
+        #
+        def audio_for(identifier)
+          find_watir_element("audio(identifier)", Elements::Audio, identifier, 'audio')
+        end
+
+        #
+        # platform method to retrieve an array of audio elements
+        #
+        def audios_for(identifier)
+          find_watir_elements("audios(identifier)", Elements::Audio, identifier, 'audio')
+        end
+
         #
         # platform method to return a PageObject::Elements::Element element
         # See PageObject::Accessors#elem

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

@@ -26,6 +26,7 @@ module PageObject
 
         def find_index_by_title(title)
           table = element.parent
+          table = table.parent if table.tag_name == 'tbody'
           first_row = table[0]
           first_row.cells.find_index {|column| column.text.include? title }
         end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/page-object.gemspec

@@ -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.24.0'
+  s.add_dependency 'selenium-webdriver', '>= 2.25.0'
 
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '< 1.2.0'

data/spec/page-object/element_locators_spec.rb

@@ -585,6 +585,72 @@ describe PageObject::ElementLocators do
       watir_page_object.file_field_elements
     end
 
+    it "should find an area element" do
+      watir_browser.should_receive(:area).with(:id => 'blah').and_return(watir_browser)
+      element = watir_page_object.area_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Area
+    end
+
+    it "should find an area element using a default identifier" do
+      watir_browser.should_receive(:area).with(:index => 0).and_return(watir_browser)
+      watir_page_object.area_element
+    end
+
+    it "should find all area elements" do
+      watir_browser.should_receive(:areas).with(:id => 'blah').and_return([watir_browser])
+      elements = watir_page_object.area_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Area
+    end
+
+    it "should find all areas with no identifier" do
+      watir_browser.should_receive(:areas).with({}).and_return([watir_browser])
+      watir_page_object.area_elements
+    end
+    
+    it "should find a canvas element" do
+      watir_browser.should_receive(:canvas).with(:id => 'blah').and_return(watir_browser)
+      element = watir_page_object.canvas_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Canvas
+    end
+
+    it "should find a canvas element using a default identifier" do
+      watir_browser.should_receive(:canvas).with(:index => 0).and_return(watir_browser)
+      watir_page_object.canvas_element
+    end
+
+    it "should find all canvas elements" do
+      watir_browser.should_receive(:canvases).with(:id => 'blah').and_return([watir_browser])
+      elements = watir_page_object.canvas_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Canvas
+    end
+
+    it "should find all canvases with no identifier" do
+      watir_browser.should_receive(:canvases).with({}).and_return([watir_browser])
+      watir_page_object.canvas_elements
+    end
+
+    it "should find an audio element" do
+      watir_browser.should_receive(:audio).with(:id => 'blah').and_return(watir_browser)
+      element = watir_page_object.audio_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Audio
+    end
+
+    it "should find an audio element using a default identifier" do
+      watir_browser.should_receive(:audio).with(:index => 0).and_return(watir_browser)
+      watir_page_object.audio_element
+    end
+
+    it "should find all audio elements" do
+      watir_browser.should_receive(:audios).with(:id => 'blah').and_return([watir_browser])
+      elements = watir_page_object.audio_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Audio
+    end
+
+    it "should find all audio elements with no identifier" do
+      watir_browser.should_receive(:audios).with({}).and_return([watir_browser])
+      watir_page_object.audio_elements
+    end
+
     it "should find an element" do
       watir_browser.should_receive(:audio).with(:id => 'blah').and_return(watir_browser)
       element = watir_page_object.element(:audio, :id => 'blah')
@@ -906,6 +972,72 @@ describe PageObject::ElementLocators do
       selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
       element = selenium_page_object.file_field_element(:id => 'blah')
       element.should be_instance_of PageObject::Elements::FileField
+    end
+
+        it "should find an area element" do
+      selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
+      element = selenium_page_object.area_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Area
+    end
+
+    it "should find an area element using a default identifier" do
+      selenium_browser.should_receive(:find_element).with(:xpath, './/area[1]').and_return(selenium_browser)
+      selenium_page_object.area_element
+    end
+
+    it "should find all area elements" do
+      selenium_browser.should_receive(:find_elements).with(:id, 'blah').and_return([selenium_browser])
+      elements = selenium_page_object.area_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Area
+    end
+
+    it "should find all areas with no identifier" do
+      selenium_browser.should_receive(:find_elements).with(:tag_name, 'area').and_return([selenium_browser])
+      selenium_page_object.area_elements
+    end
+
+    it "should find a canvas element" do
+      selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
+      element = selenium_page_object.canvas_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Canvas
+    end
+
+    it "should find a canvas element using a default identifier" do
+      selenium_browser.should_receive(:find_element).with(:xpath, './/canvas[1]').and_return(selenium_browser)
+      selenium_page_object.canvas_element
+    end
+
+    it "should find all canvas elements" do
+      selenium_browser.should_receive(:find_elements).with(:id, 'blah').and_return([selenium_browser])
+      elements = selenium_page_object.canvas_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Canvas
+    end
+
+    it "should find all canvases with no identifier" do
+      selenium_browser.should_receive(:find_elements).with(:tag_name, 'canvas').and_return([selenium_browser])
+      selenium_page_object.canvas_elements
+    end
+
+    it "should find an audio element" do
+      selenium_browser.should_receive(:find_element).with(:id, 'blah').and_return(selenium_browser)
+      element = selenium_page_object.audio_element(:id => 'blah')
+      element.should be_instance_of PageObject::Elements::Audio
+    end
+
+    it "should find an audio element using a default identifier" do
+      selenium_browser.should_receive(:find_element).with(:xpath, './/audio[1]').and_return(selenium_browser)
+      selenium_page_object.audio_element
+    end
+
+    it "should find all audio elements" do
+      selenium_browser.should_receive(:find_elements).with(:id, 'blah').and_return([selenium_browser])
+      elements = selenium_page_object.audio_elements(:id => 'blah')
+      elements[0].should be_instance_of PageObject::Elements::Audio
+    end
+
+    it "should find all audio elements with no identifier" do
+      selenium_browser.should_receive(:find_elements).with(:tag_name, 'audio').and_return([selenium_browser])
+      selenium_page_object.audio_elements
     end
   end
 end

data/spec/page-object/elements/canvas_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'page-object/elements'
+
+describe PageObject::Elements::Canvas do
+  let(:area) { PageObject::Elements::Canvas }
+
+  context "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :index, :name, :xpath].each do |t|
+        identifier = area.watir_identifier_for t => 'value'
+        identifier.keys.first.should == t
+      end
+    end
+
+    it "should map selenium types to same" do
+      [:class, :id, :index, :name, :xpath].each do |t|
+        key, value = area.selenium_identifier_for t => 'value'
+        key.should == t
+      end
+    end
+  end
+
+  context "implementation" do
+    let(:canvas_element) { double('canvas_element') }
+
+    context "when using selenium" do
+      let(:selenium_canvas) { PageObject::Elements::Canvas.new(canvas_element, :platform => :selenium_webdriver) }
+
+      it "should know its width" do
+        canvas_element.should_receive(:attribute).with(:width).and_return("400")
+        selenium_canvas.width.should == 400
+      end
+
+      it "should know its height" do
+        canvas_element.should_receive(:attribute).with(:height).and_return("100")
+        selenium_canvas.height.should == 100
+      end
+    end
+  end
+end

data/spec/page-object/elements/list_item_spec.rb

@@ -6,14 +6,14 @@ describe PageObject::Elements::ListItem do
 
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :xpath].each do |t|
+      [:class, :id, :index, :text, :xpath].each do |t|
         identifier = list_item.watir_identifier_for t => 'value'
         identifier.keys.first.should == t
       end
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :text, :xpath].each do |t|
         key, value = list_item.selenium_identifier_for t => 'value'
         key.should == t
       end

data/spec/page-object/selenium_accessors_spec.rb

@@ -31,6 +31,9 @@ class SeleniumAccessorsTestPageObject
   h6(:heading6, :id => 'main_heading')
   paragraph(:first_para, :id => 'first')
   file_field(:upload_me, :id => 'the_file')
+  area(:img_area, :id => 'area')
+  canvas(:my_canvas, :id => 'canvas')
+  audio(:acdc, :id => 'audio_id')
 end
 
 class SeleniumBlockPageObject
@@ -113,12 +116,21 @@ class SeleniumBlockPageObject
   file_field :a_file do |element|
     "file_field"
   end
+  area :img_area do |element|
+    "area"
+  end
+  canvas :my_canvas do |element|
+    "canvas"
+  end
+  audio :acdc do |element|
+    'audio'
+  end
 end
 
 describe PageObject::Accessors do
   let(:selenium_browser) { mock_selenium_browser }
   let(:selenium_page_object) { SeleniumAccessorsTestPageObject.new(selenium_browser) }
-  let(:block_page_object) { SeleniumBlockPageObject.new(watir_browser) }
+  let(:block_page_object) { SeleniumBlockPageObject.new(selenium_browser) }
   
   before(:each) do
     selenium_browser.stub(:switch_to).and_return(selenium_browser)
@@ -502,4 +514,53 @@ describe PageObject::Accessors do
       element.should be_instance_of PageObject::Elements::FileField
     end
   end
+
+  describe "area accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        selenium_page_object.should respond_to(:img_area)
+        selenium_page_object.should respond_to(:img_area_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.img_area_element.should == "area"
+      end
+    end
+
+    it "should click on the area" do
+      selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+      selenium_browser.should_receive(:click)
+      selenium_page_object.img_area
+    end
+
+    it "should retrieve the element from the page" do
+      selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+      element = selenium_page_object.img_area_element
+      element.should be_instance_of PageObject::Elements::Area
+    end
+  end
+
+  describe "canvas accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        selenium_page_object.should respond_to(:my_canvas_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.my_canvas_element.should == "canvas"
+      end
+    end
+  end
+  
+  describe "audio accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        selenium_page_object.should respond_to(:acdc_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.acdc_element.should == "audio"
+      end
+    end
+  end
 end

data/spec/page-object/watir_accessors_spec.rb

@@ -31,6 +31,9 @@ class WatirAccessorsTestPageObject
   h6(:heading6, :id => 'main_heading')
   paragraph(:first_para, :id => 'first')
   file_field(:upload_me, :id => 'the_file')
+  area(:img_area, :id => 'area')
+  canvas(:my_canvas, :id => 'canvas_id')
+  audio(:acdc, :id => 'audio_id')
 end
 
 class WatirBlockPageObject
@@ -113,6 +116,15 @@ class WatirBlockPageObject
   file_field :a_file do |element|
     "file_field"
   end
+  area :img_area do |element|
+    "area"
+  end
+  canvas :my_canvas do |element|
+    "canvas"
+  end
+  audio :acdc do |element|
+    "audio"
+  end
 end
 
 describe PageObject::Accessors do
@@ -1025,4 +1037,53 @@ describe PageObject::Accessors do
       element.should be_instance_of PageObject::Elements::FileField
     end
   end
+
+  describe "area accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        watir_page_object.should respond_to(:img_area)
+        watir_page_object.should respond_to(:img_area_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.img_area_element.should == "area"
+      end
+    end
+
+    it "should click on the area" do
+      watir_browser.should_receive(:area).and_return(watir_browser)
+      watir_browser.should_receive(:click)
+      watir_page_object.img_area
+    end
+
+    it "should retrieve the element from the page" do
+      watir_browser.should_receive(:area).and_return(watir_browser)
+      element = watir_page_object.img_area_element
+      element.should be_instance_of PageObject::Elements::Area
+    end
+  end
+
+  describe "canvas accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        watir_page_object.should respond_to(:my_canvas_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.my_canvas_element.should == "canvas"
+      end
+    end
+  end
+  
+  describe "audio accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        watir_page_object.should respond_to(:acdc_element)
+      end
+
+      it "should call a block on the element method when present" do
+        block_page_object.acdc_element.should == "audio"
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,9 @@ files:
 - cucumber.yml
 - features/area.feature
 - features/async.feature
+- features/audio.feature
 - features/button.feature
+- features/canvas.feature
 - features/check_box.feature
 - features/div.feature
 - features/element.feature
@@ -183,7 +185,9 @@ files:
 - features/step_definitions/accessor_steps.rb
 - features/step_definitions/area_steps.rb
 - features/step_definitions/async_steps.rb
+- features/step_definitions/audio_steps.rb
 - features/step_definitions/button_steps.rb
+- features/step_definitions/canvas_steps.rb
 - features/step_definitions/check_box_steps.rb
 - features/step_definitions/div_steps.rb
 - features/step_definitions/element_steps.rb
@@ -231,7 +235,9 @@ files:
 - lib/page-object/element_locators.rb
 - lib/page-object/elements.rb
 - lib/page-object/elements/area.rb
+- lib/page-object/elements/audio.rb
 - lib/page-object/elements/button.rb
+- lib/page-object/elements/canvas.rb
 - lib/page-object/elements/check_box.rb
 - lib/page-object/elements/div.rb
 - lib/page-object/elements/element.rb
@@ -303,6 +309,7 @@ files:
 - spec/page-object/element_locators_spec.rb
 - spec/page-object/elements/area_spec.rb
 - spec/page-object/elements/button_spec.rb
+- spec/page-object/elements/canvas_spec.rb
 - spec/page-object/elements/check_box_spec.rb
 - spec/page-object/elements/div_spec.rb
 - spec/page-object/elements/element_spec.rb
@@ -354,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3346417755984147094
+      hash: -4250086403219071004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -363,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3346417755984147094
+      hash: -4250086403219071004
 requirements: []
 rubyforge_project: page-object
 rubygems_version: 1.8.24
@@ -373,7 +380,9 @@ summary: Page Object DSL for browser testing
 test_files:
 - features/area.feature
 - features/async.feature
+- features/audio.feature
 - features/button.feature
+- features/canvas.feature
 - features/check_box.feature
 - features/div.feature
 - features/element.feature
@@ -429,7 +438,9 @@ test_files:
 - features/step_definitions/accessor_steps.rb
 - features/step_definitions/area_steps.rb
 - features/step_definitions/async_steps.rb
+- features/step_definitions/audio_steps.rb
 - features/step_definitions/button_steps.rb
+- features/step_definitions/canvas_steps.rb
 - features/step_definitions/check_box_steps.rb
 - features/step_definitions/div_steps.rb
 - features/step_definitions/element_steps.rb
@@ -474,6 +485,7 @@ test_files:
 - spec/page-object/element_locators_spec.rb
 - spec/page-object/elements/area_spec.rb
 - spec/page-object/elements/button_spec.rb
+- spec/page-object/elements/canvas_spec.rb
 - spec/page-object/elements/check_box_spec.rb
 - spec/page-object/elements/div_spec.rb
 - spec/page-object/elements/element_spec.rb