Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 28 insertions, 0 deletions

diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
new file mode 100644
index 0000000000..5955fd2856
--- /dev/null
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+require 'initializer'
+require 'rails/backtrace_cleaner'
+
+class TestWithBacktrace
+  include Test::Unit::Util::BacktraceFilter
+  include Rails::BacktraceFilterForTestUnit
+end
+
+class BacktraceCleanerFilterTest < ActiveSupport::TestCase
+  def setup
+    @test = TestWithBacktrace.new
+    @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ]
+  end
+  
+  test "test with backtrace should use the rails backtrace cleaner to clean" do
+    Rails.stubs(:backtrace_cleaner).returns(stub(:clean))
+    Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil)
+    @test.filter_backtrace(@backtrace)
+  end
+  
+  test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do
+    assert_nothing_raised do
+      @test.filter_backtrace(@backtrace, '/opt/local/lib')
+    end
+  end
+end
\ No newline at end of file