Merge branch 'stable'

2010-03-01 18:34:40 -08:00 · 2010-03-01 18:34:40 -08:00 · 76fa7cc8d3
parent 9f739121b9 a66ba5be6d
commit 76fa7cc8d3
1 changed files with 7 additions and 1 deletions
--- a/test/haml/template_test.rb
+++ b/test/haml/template_test.rb
@ -80,7 +80,13 @@ class TemplateTest < Test::Unit::TestCase
    # It's usually provided by ActionController::Base.
    def base.protect_against_forgery?; false; end

-    base.controller = DummyController.new
+    # In Rails <= 2.1, a fake controller object was needed
+    # to provide the controller path.
+    if ActionPack::VERSION::MAJOR < 2 ||
+        (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
+      base.controller = DummyController.new
+    end
+
    base
  end