2 files changed, 21 insertions, 11 deletions
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 25fa100275..712c8bef36 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -52,30 +52,23 @@ module ApplicationTests
       end
     end
 
-    test "generators set rails fallbacks" do
-      with_config do |c|
-        c.generators.fallbacks[:shoulda] = :test_unit
-        expected = { :shoulda => :test_unit }
-        assert_equal expected, c.generators.fallbacks
-      end
-    end
-
-    test "generators aliases, options and fallbacks on initialization" do
+    test "generators aliases, options, templates and fallbacks on initialization" do
       add_to_config <<-RUBY
         config.generators.rails :aliases => { :test_framework => "-w" }
         config.generators.orm :datamapper
         config.generators.test_framework :rspec
         config.generators.fallbacks[:shoulda] = :test_unit
+        config.generators.templates << "some/where"
       RUBY
 
       # Initialize the application
       require "#{app_path}/config/environment"
       require "rails/generators"
-      Rails::Generators.configure!
 
       assert_equal :rspec, Rails::Generators.options[:rails][:test_framework]
       assert_equal "-w", Rails::Generators.aliases[:rails][:test_framework]
-      assert_equal :test_unit, Rails::Generators.fallbacks[:shoulda]
+      assert_equal Hash[:shoulda => :test_unit], Rails::Generators.fallbacks
+      assert_equal ["#{app_path}/lib/templates", "some/where"], Rails::Generators.templates_path
     end
 
     test "generators no color on initialization" do
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 37175783d8..de316a6fd0 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -23,6 +23,23 @@ module ApplicationTests
       run_test 'unit/foo_test.rb'
     end
 
+    # Run just in Ruby < 1.9
+    if defined?(Test::Unit::Util::BacktraceFilter)
+      test "adds backtrace cleaner" do
+        app_file 'test/unit/backtrace_test.rb', <<-RUBY
+          require 'test_helper'
+
+          class FooTest < ActiveSupport::TestCase
+            def test_truth
+              assert Test::Unit::Util::BacktraceFilter.ancestors.include?(Rails::BacktraceFilterForTestUnit)
+            end
+          end
+        RUBY
+
+        run_test 'unit/backtrace_test.rb'
+      end
+    end
+
     test "integration test" do
       controller 'posts', <<-RUBY
         class PostsController < ActionController::Base