Adding Webrat::XML.xpath_to method

lib/webrat/core/area.rb

@@ -15,11 +15,7 @@ module Webrat
     end
     
     def path
-      if Webrat.configuration.parse_with_nokogiri?
+      Webrat::XML.xpath_to(@element)
-        @element.path
-      else
-        @element.xpath
-      end
     end
     
   protected

lib/webrat/core/field.rb

@@ -27,11 +27,7 @@ module Webrat
     end
     
     def path
-      if Webrat.configuration.parse_with_nokogiri?
+      Webrat::XML.xpath_to(@element)
-        @element.path
-      else
-        @element.xpath
-      end
     end
     
     def matches_name?(name)

lib/webrat/core/form.rb

@@ -18,11 +18,7 @@ module Webrat
     def field_by_element(element, *field_types)
       return nil if element.nil?
       
-      if Webrat.configuration.parse_with_nokogiri?
+      expected_path = Webrat::XML.xpath_to(element)
-        expected_path = element.path
-      else
-        expected_path = element.xpath
-      end
       
       fields_by_type(field_types).detect do |possible_field|
         possible_field.path == expected_path

lib/webrat/core/locators.rb

@@ -55,11 +55,7 @@ module Webrat
     def area_by_element(element)
       return nil if element.nil?
       
-      if Webrat.configuration.parse_with_nokogiri?
+      expected_path = Webrat::XML.xpath_to(element)
-        expected_path = element.path
-      else
-        expected_path = element.xpath
-      end
       
       areas.detect do |possible_area|
         possible_area.path == expected_path

lib/webrat/core/session.rb

@@ -38,6 +38,7 @@ module Webrat
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
+      @elements        = {}
       @context         = context
     end
 
@@ -110,6 +111,7 @@ module Webrat
       save_and_open_page if exception_caught? && Webrat.configuration.open_error_files?
       raise PageLoadError.new("Page load was not successful (Code: #{response_code.inspect}):\n#{formatted_error}") unless success_code?
       
+      @elements     = {}
       @_scopes      = nil
       @_page_scope  = nil
       @current_url  = url

lib/webrat/core/xml.rb

@@ -62,6 +62,14 @@ module Webrat #:nodoc:
       end
     end
     
+    def self.xpath_to(element)
+      if Webrat.configuration.parse_with_nokogiri?
+        element.path
+      else
+        element.xpath
+      end
+    end
+    
     def self.attribute(element, attribute_name)
       return element[attribute_name] if element.is_a?(Hash)