page-object 0.8.5 → 0.8.6

data/.rvmrc

@@ -1,2 +1,2 @@
-rvm --create use 1.9.3-p194@page-object  
+rvm --create use 1.9.3-p392@page-object  
 

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Version 0.8.6 / 2013-2-27
+* Enhancements
+  * Added support for the svg element
+* Fixes
+  * Fixed issue with nested generic element calls
+
 === Version 0.8.5 / 2013-2-21
 * Enhancements
   * Updated to use the latest selenium-webdriver 2.30 - support for Firefox 19

data/features/generic_elements.feature

@@ -21,4 +21,9 @@ Feature: Generic Elements
 
   Scenario: Getting the text from the details element
     When I get the text from the details
-    Then the text should be "The summary The details"
+    Then the text should be "The summary The details"
+
+  Scenario: getting properties from a svg element
+    When I get the svg element
+    Then the svg width should be "100"
+    And the svg height should be "100"

data/features/html/static_elements.html

@@ -54,6 +54,10 @@
       Your browser does not support the video tag.
     </video>
     
+    <svg width="100" height="100" id="the_svg">
+      <circle cx="50" cy="50" r="40" fill="red" stroke="blue" stroke-width="5" />
+    </svg>    
+
     <a href="success.html" id="link_id" name="link_name" class="link_class" title="link_title">Google Search</a>
 
     <input id="cb_id" name="cb_name" class="cb_class" type="checkbox" value="1"/>

data/features/step_definitions/generic_element_steps.rb

@@ -17,3 +17,15 @@ end
 When /^I get the text from the details$/ do
 	@text = @page.details_id
 end
+
+When /^I get the svg element$/ do
+  @svg = @page.svg_id_element
+end
+
+Then /^the svg width should be "(.*?)"$/ do |width|
+  @svg.attribute('width').should == width
+end
+
+Then /^the svg height should be "(.*?)"$/ do |height|
+  @svg.attribute('height').should == height
+end

data/features/support/page.rb

@@ -351,5 +351,6 @@ class Page
   element(:summary_id, :summary, :id => 'summary_id')
   element(:details_id, :details, :id => 'details_id')
 
+  svg(:svg_id, :id => 'the_svg')
 end
 

data/lib/page-object/accessors.rb

@@ -1027,6 +1027,30 @@ module PageObject
       end
     end
 
+    #
+    # adds two methods - one to retrieve a svg, and another to check
+    # the svg's existence.
+    #
+    # @example
+    #   svg(:circle, :id => 'circle')
+    #   # 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 paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :css => Selenium only
+    #   * :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 svg(name, identifier={:index => 0}, &block)
+      standard_methods(name, identifier, 'svg_for', &block)
+    end
+
+
     #
     # methods to generate accessors for types that follow the same
     # pattern as element

data/lib/page-object/locator_generator.rb

@@ -32,7 +32,17 @@ module PageObject
        :canvas,
        :audio,
        :video,
-       :abbr,
+       :svg].each do |tag|
+        target.send(:define_method, "#{tag.to_s}_element") do |*identifier|
+          @platform.send "#{tag.to_s}_for", locator(identifier)
+        end
+
+        target.send(:define_method, "#{tag.to_s}_elements") do |*identifier|
+          @platform.send("#{tag.to_s}s_for", identifier[0] ? identifier[0] : {})
+        end
+      end
+
+      [:abbr,
        :address,
        :article,
        :aside,
@@ -64,11 +74,11 @@ module PageObject
        :var,
        :wbr].each do |tag|
         target.send(:define_method, "#{tag.to_s}_element") do |*identifier|
-          @platform.send "#{tag.to_s}_for", locator(identifier)
+          @platform.send :element_for, locator(identifier)
         end
 
         target.send(:define_method, "#{tag.to_s}_elements") do |*identifier|
-          @platform.send("#{tag.to_s}s_for", identifier[0] ? identifier[0] : {})
+          @platform.send(:elements_for, identifier[0] ? identifier[0] : {})
         end
       end
     end

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

@@ -988,6 +988,20 @@ module PageObject
           find_selenium_elements(identifier, Elements::Element, tag.to_s)
         end
 
+       #
+        # platform method to return a svg element
+        #
+        def svg_for(identifier)
+          find_selenium_element(identifier, Elements::Element, 'svg')
+        end
+ 
+        #
+        # platform method to return an array of svg elements
+        #
+        def svgs_for(identifier)
+          find_selenium_elements(identifier, Elements::Element, 'svg')
+        end
+ 
         private
         
         def process_selenium_call(identifier, type, tag, other=nil)

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

@@ -277,7 +277,7 @@ module PageObject
         # See PageObject::Accessors#select_list
         #
         def select_list_value_for(identifier)
-          process_watir_call("select_list(identifier).options.each {|o| return o.text if o.selected?}",
+          process_watir_call("select_list(identifier).options.find {|o| o.selected?}.text",
                              Elements::SelectList, identifier)
         end
 
@@ -901,16 +901,34 @@ module PageObject
 
         #
         # platform method to return a PageObject::Elements::Element element
-        # See PageObject::Accessors#elem
+        # See PageObject::Accessors#element
         #
         def element_for(tag, identifier)
           find_watir_element("#{tag.to_s}(identifier)", Elements::Element, identifier, tag.to_s)
         end
 
+        #
+        # platform method to return an array of  PageObject::Elements::Element elements
+        # See PageObject::Accessors#element
+        #
         def elements_for(tag, identifier)
           find_watir_elements("#{tag.to_s}s(identifier)", Elements::Element, identifier, tag.to_s)
         end
 
+        #
+        # platform method to return a svg element
+        #
+        def svg_for(identifier)
+          find_watir_element("element(identifier)", Elements::Element, identifier)
+        end
+ 
+        #
+        # platform method to return an array of svg elements
+        #
+        def svgs_for(identifier)
+          find_watir_elements("element(identifier)", Elements::Element, identifier)
+        end
+ 
         private
     
         def find_watir_elements(the_call, type, identifier, tag_name=nil)

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -397,7 +397,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2605320443104154235
+      hash: -3437791365044287985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -406,10 +406,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2605320443104154235
+      hash: -3437791365044287985
 requirements: []
 rubyforge_project: page-object
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Page Object DSL for browser testing