Update RJS for Rails 4. Fix test suite.

Author: jeremy

Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.libs << 'test'
+  t.libs << 'test/lib'
   t.test_files = Dir.glob('test/*_test.rb') + Dir.glob('test/{controller,template}/**/*_test.rb')
   t.warning = true
   t.verbose = true

lib/action_view/helpers/prototype_helper.rb

@@ -4,6 +4,12 @@
 require 'active_support/core_ext/string/output_safety'
 
 module ActionView
+  # A string that returns itself as its JSON-encoded form.
+  class JsonLiteral < String
+    def as_json(options = nil) self end #:nodoc:
+    def encode_json(encoder) self end #:nodoc:
+  end
+
   # = Action View Prototype Helpers
   module Helpers
     # Prototype[http://www.prototypejs.org/] is a JavaScript library that provides
@@ -147,6 +153,7 @@ def remote_function(options)
       class JavaScriptGenerator #:nodoc:
         def initialize(context, &block) #:nodoc:
           @context, @lines = context, []
+          def @lines.encoding() last.to_s.encoding end
           include_helpers_from_context
           @context.with_output_buffer(@lines) do
             @context.instance_exec(self, &block)
@@ -155,7 +162,7 @@ def initialize(context, &block) #:nodoc:
 
         private
           def include_helpers_from_context
-            extend @context.helpers if @context.respond_to?(:helpers) && @context.helpers
+            extend @context.controller._helpers if @context.controller.respond_to?(:_helpers) && @context.controller._helpers
             extend GeneratorMethods
           end
 
@@ -253,14 +260,21 @@ def [](id)
               when String, Symbol, NilClass
                 JavaScriptElementProxy.new(self, id)
               else
-                JavaScriptElementProxy.new(self, ActionController::RecordIdentifier.dom_id(id))
+                JavaScriptElementProxy.new(self, RecordIdentifier.dom_id(id))
             end
           end
 
+          RecordIdentifier =
+            if defined? ActionView::RecordIdentifier
+              ActionView::RecordIdentifier
+            else
+              ActionController::RecordIdentifier
+            end
+
           # Returns an object whose <tt>to_json</tt> evaluates to +code+. Use this to pass a literal JavaScript
           # expression as an argument to another JavaScriptGenerator method.
           def literal(code)
-            ::ActiveSupport::JSON::Variable.new(code.to_s)
+            JsonLiteral.new(code.to_s)
           end
 
           # Returns a collection reference by finding it through a CSS +pattern+ in the DOM. This collection can then be
@@ -517,6 +531,15 @@ def delay(seconds = 1)
             record "}, #{(seconds * 1000).to_i})"
           end
 
+          def javascript_object_for(object)
+            ::ActiveSupport::JSON.encode(object)
+          end
+
+          def arguments_for_call(arguments, block = nil)
+            arguments << block_to_function(block) if block
+            arguments.map { |argument| javascript_object_for(argument) }.join ', '
+          end
+
           private
             def loop_on_multiple_args(method, ids)
               record(ids.size>1 ?
@@ -547,7 +570,7 @@ def render(*options)
 
             def with_formats(*args)
               return yield unless @context
-              
+
               lookup = @context.lookup_context
               begin
                 old_formats, lookup.formats = lookup.formats, args
@@ -557,15 +580,6 @@ def with_formats(*args)
               end
             end
 
-            def javascript_object_for(object)
-              ::ActiveSupport::JSON.encode(object)
-            end
-
-            def arguments_for_call(arguments, block = nil)
-              arguments << block_to_function(block) if block
-              arguments.map { |argument| javascript_object_for(argument) }.join ', '
-            end
-
             def block_to_function(block)
               generator = self.class.new(@context, &block)
               literal("function() { #{generator.to_s} }")
@@ -655,7 +669,6 @@ def build_callbacks(options)
 
     # Converts chained method calls on DOM proxy elements into JavaScript chains
     class JavaScriptProxy < ActiveSupport::ProxyObject #:nodoc:
-
       def initialize(generator, root = nil)
         @generator = generator
         @generator << root if root
@@ -730,7 +743,7 @@ def reload(options_for_replace = {})
 
     class JavaScriptVariableProxy < JavaScriptProxy #:nodoc:
       def initialize(generator, variable)
-        @variable = ::ActiveSupport::JSON::Variable.new(variable)
+        @variable = JsonLiteral.new(variable)
         @empty    = true # only record lines if we have to.  gets rid of unnecessary linebreaks
         super(generator)
       end
@@ -754,8 +767,8 @@ def append_to_function_chain!(call)
     end
 
     class JavaScriptCollectionProxy < JavaScriptProxy #:nodoc:
-      ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :find_all, :select, :max, :min, :partition, :reject, :sort_by, :in_groups_of, :each_slice] unless defined? ENUMERABLE_METHODS_WITH_RETURN
-      ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each] unless defined? ENUMERABLE_METHODS
+      ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :find_all, :select, :max, :min, :partition, :reject, :sort_by, :in_groups_of, :each_slice]
+      ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each]
       attr_reader :generator
       delegate :arguments_for_call, :to => :generator
 
@@ -773,7 +786,7 @@ def each_slice(variable, number, &block)
       end
 
       def grep(variable, pattern, &block)
-        enumerate :grep, :variable => variable, :return => true, :method_args => [::ActiveSupport::JSON::Variable.new(pattern.inspect)], :yield_args => %w(value index), &block
+        enumerate :grep, :variable => variable, :return => true, :method_args => [JsonLiteral.new(pattern.inspect)], :yield_args => %w(value index), &block
       end
 
       def in_groups_of(variable, number, fill_with = nil)
@@ -797,7 +810,7 @@ def zip(variable, *arguments, &block)
         append_enumerable_function!("zip(#{arguments_for_call arguments}")
         if block
           function_chain[-1] += ", function(array) {"
-          yield ::ActiveSupport::JSON::Variable.new('array')
+          yield JsonLiteral.new('array')
           add_return_statement!
           @generator << '});'
         else
@@ -810,7 +823,7 @@ def method_missing(method, *arguments, &block)
           if ENUMERABLE_METHODS.include?(method)
             returnable = ENUMERABLE_METHODS_WITH_RETURN.include?(method)
             variable   = arguments.first if returnable
-            enumerate(method, {:variable => (arguments.first if returnable), :return => returnable, :yield_args => %w(value index)}, &block)
+            enumerate(method, {:variable => variable, :return => returnable, :yield_args => %w(value index)}, &block)
           else
             super
           end

lib/prototype-rails/javascript_helper.rb

@@ -2,6 +2,8 @@
 
 ActionView::Helpers::JavaScriptHelper.module_eval do
   include ActionView::Helpers::PrototypeHelper
+  undef_method :button_to_function
+  undef_method :link_to_function
 
   # Returns a button with the given +name+ text that'll trigger a JavaScript +function+ using the
   # onclick handler.

lib/prototype-rails/selector_assertions.rb

@@ -124,7 +124,7 @@ def assert_select_rjs(*args, &block)
     end
 
     if matches
-      assert_block("") { true } # to count the assertion
+      assert true # to count the assertion
       if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type)
         begin
           @selected ||= nil

test/controller/caching_test.rb

@@ -1,10 +1,7 @@
-require 'fileutils'
 require 'abstract_unit'
 
-CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
-FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
-ActionController::Base.page_cache_directory = FILE_STORE_PATH
+FILE_STORE_PATH = File.expand_path('../../../temp/test_cache', __FILE__)
 
 class CachingController < ActionController::Base
   abstract!
@@ -41,6 +38,6 @@ def test_fragment_caching_in_rjs_partials
     xhr :get, :js_fragment_cached_with_partial
     assert_response :success
     assert_match(/Old fragment caching in a partial/, @response.body)
-    assert_match("Old fragment caching in a partial", @store.read('views/test.host/functional_caching/js_fragment_cached_with_partial'))
+    assert_match "Old fragment caching in a partial", @store.instance_variable_get('@data').values.first.value
   end
-end
+end

test/lib/abstract_unit.rb

@@ -1,27 +1,17 @@
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+require 'rubygems'
+require 'bundler/setup'
+require 'minitest/autorun'
 
-$:.unshift(File.dirname(__FILE__) + '/lib')
-
-if defined? Gem
-  Gem.source_index
-  gem 'bundler'
-else
-  require 'rubygems'
-end
-require 'bundler'
-Bundler.setup
-
-require 'test/unit'
 require 'active_support'
+require 'active_support/test_case'
 require 'action_controller'
 require 'action_view'
 require 'action_view/testing/resolvers'
 
 require 'prototype-rails/on_load_action_controller'
 require 'prototype-rails/on_load_action_view'
 
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+FIXTURE_LOAD_PATH = File.expand_path('../../fixtures', __FILE__)
 FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
 
 
@@ -59,11 +49,11 @@ class TestCase
     # have been loaded.
     setup_once do
       SharedTestRoutes.draw do
-        match ':controller(/:action)'
+        get ':controller(/:action)'
       end
 
       ActionDispatch::IntegrationTest.app.routes.draw do
-        match ':controller(/:action)'
+        get ':controller(/:action)'
       end
     end
   end
@@ -88,7 +78,7 @@ class BasicController
   def config
     @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|
       # VIEW TODO: View tests should not require a controller
-      public_dir = File.expand_path("../fixtures/public", __FILE__)
+      public_dir = "#{FIXTURE_LOAD_PATH}/public"
       config.assets_dir = public_dir
       config.javascripts_dir = "#{public_dir}/javascripts"
       config.stylesheets_dir = "#{public_dir}/stylesheets"
@@ -109,7 +99,7 @@ def self.build_app(routes = nil)
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"
       middleware.use "ActionDispatch::Flash"
-      middleware.use "ActionDispatch::Head"
+      middleware.use "Rack::Head"
       yield(middleware) if block_given?
     end
   end

test/render_other_test.rb

@@ -162,17 +162,15 @@ def setup
   end
 
   def test_enum_rjs_test
-    SecureRandom.stubs(:base64).returns("asdf")
-    get :enum_rjs_test
-    body = %{
-      $$(".product").each(function(value, index) {
+    pre = %[$$(".product").each(function(value, index) {
       new Effect.Highlight(element,{});
       new Effect.Highlight(value,{});
-      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/render_other_test/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value) + '&authenticity_token=' + encodeURIComponent('asdf')})}});
-      new Draggable(value, {});
-      });
-    }.gsub(/^      /, '').strip
-    assert_equal body, @response.body
+      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/render_other_test/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value) + '&authenticity_token=' + encodeURIComponent('].gsub(/^\s+/, '')
+    post = %[')})}});\nnew Draggable(value, {});\n});]
+
+    get :enum_rjs_test
+    assert_match pre, @response.body
+    assert_match post, @response.body
   end
 
   def test_explicitly_rendering_an_html_template_with_implicit_html_template_renders_should_be_possible_from_an_rjs_template

test/template/scriptaculous_helper_test.rb

@@ -50,33 +50,33 @@ def test_toggle_effects
 
 
   def test_sortable_element
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nSortable.create(\"mylist\", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
       sortable_element("mylist", :url => { :action => "order" })
-    assert_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}, tag:'div'})\n//]]>\n</script>),
+    assert_equal %(<script>\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}, tag:'div'})\n//]]>\n</script>),
       sortable_element("mylist", :tag => "div", :constraint => "horizontal", :url => { :action => "order" })
-    assert_dom_equal %|<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', containment:['list1','list2'], onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>|,
+    assert_dom_equal %|<script>\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', containment:['list1','list2'], onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>|,
       sortable_element("mylist", :containment => ['list1','list2'], :constraint => "horizontal", :url => { :action => "order" })
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', containment:'list1', onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', containment:'list1', onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
       sortable_element("mylist", :containment => 'list1', :constraint => "horizontal", :url => { :action => "order" })
   end
 
   def test_draggable_element
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Draggable(\"product_13\", {})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nnew Draggable(\"product_13\", {})\n//]]>\n</script>),
       draggable_element("product_13")
-    assert_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Draggable(\"product_13\", {revert:true})\n//]]>\n</script>),
+    assert_equal %(<script>\n//<![CDATA[\nnew Draggable(\"product_13\", {revert:true})\n//]]>\n</script>),
       draggable_element("product_13", :revert => true)
   end
 
   def test_drop_receiving_element
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {onDrop:function(element){new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nDroppables.add(\"droptarget1\", {onDrop:function(element){new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
       drop_receiving_element("droptarget1")
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:'products', onDrop:function(element){new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:'products', onDrop:function(element){new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
       drop_receiving_element("droptarget1", :accept => 'products')
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:'products', onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:'products', onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
       drop_receiving_element("droptarget1", :accept => 'products', :update => 'infobox')
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:['tshirts','mugs'], onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:['tshirts','mugs'], onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
       drop_receiving_element("droptarget1", :accept => ['tshirts','mugs'], :update => 'infobox')
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add("droptarget1", {hoverclass:'dropready', onDrop:function(element){if (confirm('Are you sure?')) { new Ajax.Request('http://www.example.com/update_drop', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)}); }}})\n//]]>\n</script>),
+    assert_dom_equal %(<script>\n//<![CDATA[\nDroppables.add("droptarget1", {hoverclass:'dropready', onDrop:function(element){if (confirm('Are you sure?')) { new Ajax.Request('http://www.example.com/update_drop', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)}); }}})\n//]]>\n</script>),
     drop_receiving_element('droptarget1', :hoverclass=>'dropready', :url=>{:action=>'update_drop'}, :confirm => 'Are you sure?')
 
   end