Make all AP tests pass for Ruby 1.9.1.

4 files changed, 19 insertions, 17 deletions

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 0bb73b590d..27ee8b23c9 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -13,18 +13,21 @@ module ActionView
     mattr_accessor :registered_details
     self.registered_details = []
 
-    def self.register_detail(name, options = {})
+    def self.register_detail(name, options = {}, &block)
       self.registered_details << name
 
-      Setters.send :define_method, :"#{name}=" do |value|
-        value = Array(value.presence || yield)
-        value |= [nil] unless options[:allow_nil] == false
+      Setters.send :define_method, :"_#{name}_defaults", &block
+      Setters.module_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          value = Array(value.presence || _#{name}_defaults)
+          #{"value << nil unless value.include?(nil)" unless options[:allow_nil] == false}
 
-        unless value == @details[name]
-          @details_key, @details = nil, @details.merge(name => value)
-          @details.freeze
+          unless value == @details[:#{name}]
+            @details_key, @details = nil, @details.merge(:#{name} => value)
+            @details.freeze
+          end
         end
-      end
+      METHOD
     end
 
     # Holds raw setters for the registered details.
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index f89e5fda07..00ca5ec9dc 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -1,12 +1,12 @@
 require 'abstract_unit'
 
 class TestRoutingMount < ActionDispatch::IntegrationTest
-  SprocketsApp = lambda { |env|
-    [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
-  }
-
   Router = ActionDispatch::Routing::RouteSet.new
   Router.draw do
+    SprocketsApp = lambda { |env|
+      [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
+    }
+
     mount SprocketsApp, :at => "/sprockets"
     mount SprocketsApp => "/shorthand"
 
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index eda76ddfd0..02248d84ad 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -12,7 +12,7 @@ module ActionView #:nodoc:
     def query(partial, path, exts)
       query = Regexp.escape(path)
       exts.each do |ext|
-        query << '(?:' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
+        query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
       end
 
       templates = []
@@ -21,7 +21,8 @@ module ActionView #:nodoc:
         templates << Template.new(source, path, handler,
           :partial => partial, :virtual_path => path, :format => format)
       end
-      templates.sort_by {|t| -t.formats.size }
+
+      templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
     end
 
   end
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index bf07735724..697ebc694a 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -33,9 +33,7 @@ class LookupContextTest < ActiveSupport::TestCase
   end
 
   test "does not allow details to be modified in place" do
-    assert_raise TypeError do
-      @lookup_context.details.clear
-    end
+    assert @lookup_context.details.frozen?
   end
 
   test "allows me to update an specific detail" do