Removed all helpers from PrototypeHelper that are implemented in Ajax…

…Helper. Modified tests that extended with PrototypeHelper to now extend using AjaxHelper. AjaxHelper is now included by default in view helper

actionpack/lib/action_view/helpers.rb

@@ -15,7 +15,7 @@ module Helpers #:nodoc:
     autoload :FormTagHelper, 'action_view/helpers/form_tag_helper'
     autoload :JavaScriptHelper, 'action_view/helpers/javascript_helper'
     autoload :NumberHelper, 'action_view/helpers/number_helper'
-    autoload :PrototypeHelper, 'action_view/helpers/prototype_helper'
+    autoload :AjaxHelper, 'action_view/helpers/ajax_helper'
     autoload :RawOutputHelper, 'action_view/helpers/raw_output_helper'
     autoload :RecordIdentificationHelper, 'action_view/helpers/record_identification_helper'
     autoload :RecordTagHelper, 'action_view/helpers/record_tag_helper'
@@ -48,7 +48,7 @@ module ClassMethods
     include FormTagHelper
     include JavaScriptHelper
     include NumberHelper
-    include PrototypeHelper
+    include AjaxHelper
     include RawOutputHelper
     include RecordIdentificationHelper
     include RecordTagHelper

actionpack/lib/action_view/helpers/ajax_helper.rb

@@ -1,7 +1,9 @@
 module ActionView
   module Helpers
     module AjaxHelper
-      include PrototypeHelper
+      # Included for backwards compatibility / RJS functionality
+      # Rails classes should not be aware of individual JS frameworks
+      include PrototypeHelper 
 
       def remote_form_for(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
@@ -19,6 +21,7 @@ def form_remote_tag(options = {}, &block)
         attributes.merge!(options)
 
         url = attributes.delete("data-url")
+        attributes.delete(:builder)
         form_tag(attributes.delete(:action) || url, attributes, &block)
       end