restructure compatibility module so it is no longer a child

actionpack/lib/action_view/helpers.rb

@@ -3,7 +3,7 @@ require 'active_support/benchmarkable'
 module ActionView #:nodoc:
   module Helpers #:nodoc:
     autoload :ActiveModelHelper, 'action_view/helpers/active_model_helper'
-    autoload :AjaxHelper, 'action_view/helpers/ajax_helper'
+    autoload :AjaxHelperCompat, 'action_view/helpers/ajax_helper'
     autoload :AssetTagHelper, 'action_view/helpers/asset_tag_helper'
     autoload :AtomFeedHelper, 'action_view/helpers/atom_feed_helper'
     autoload :CacheHelper, 'action_view/helpers/cache_helper'
@@ -48,7 +48,7 @@ module ActionView #:nodoc:
     include FormTagHelper
     include JavaScriptHelper
     include NumberHelper
-    include AjaxHelper
+    include AjaxHelperCompat
     include RawOutputHelper
     include RecordIdentificationHelper
     include RecordTagHelper

actionpack/lib/action_view/helpers/ajax_helper.rb

@@ -154,34 +154,37 @@ module ActionView
         def create_js_function(statements, *arguments)
           "function(#{arguments.join(", ")}) {#{statements}}"
         end
+    end
 
-      # TODO: All evaled goes here per wycat
-      module Rails2Compatibility
-        def set_callbacks(options, html)
-          [:complete, :failure, :success, :interactive, :loaded, :loading].each do |type|
-            html["data-#{type}-code"]  = options.delete(type.to_sym)
-          end
+    # TODO: All evaled goes here per wycat
+    module AjaxHelperCompat
+      include AjaxHelper
 
-          options.each do |option, value|
-            if option.is_a?(Integer)
-              html["data-#{option}-code"] = options.delete(option)
-            end
+      def set_callbacks(options, html)
+        [:complete, :failure, :success, :interactive, :loaded, :loading].each do |type|
+          html["data-#{type}-code"]  = options.delete(type.to_sym)
+        end
+
+        options.each do |option, value|
+          if option.is_a?(Integer)
+            html["data-#{option}-code"] = options.delete(option)
           end
         end
-        
-        def link_to_remote(name, url, options = nil)
-          if !options && url.is_a?(Hash) && url.key?(:url)
-            url, options = url.delete(:url), url
-          end
-          set_callbacks(options, options[:html] ||= {})
-          
-          super
+      end
+      
+      def link_to_remote(name, url, options = nil)
+        if !options && url.is_a?(Hash) && url.key?(:url)
+          url, options = url.delete(:url), url
         end
+        set_callbacks(options, options[:html] ||= {})
         
-        def button_to_remote(name, options = {}, html_options = {})
-          set_callbacks(options, html_options)
-          super
-        end
+        super
+      end
+      
+      def button_to_remote(name, options = {}, html_options = {})
+        html_options.merge!(:testing => true)
+        set_callbacks(options, html_options)
+        super
       end
     end
   end

actionpack/lib/action_view/helpers/javascript_helper.rb

@@ -39,7 +39,7 @@ module ActionView
         JAVASCRIPT_PATH = File.join(File.dirname(__FILE__), 'javascripts')
       end
 
-      include AjaxHelper::Rails2Compatibility
+      include AjaxHelperCompat
 
       # Returns a link of the given +name+ that will trigger a JavaScript +function+ using the
       # onclick handler and return false after the fact.