diff options
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/test_case.rb | 18 | ||||
-rw-r--r-- | activesupport/lib/active_support/testing/mocha_minitest_adapter.rb | 45 |
2 files changed, 7 insertions, 56 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 90c6aff215..1cc8564a18 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -1,22 +1,18 @@ -require 'test/unit/testcase' -require 'active_support/testing/setup_and_teardown' -require 'active_support/testing/assertions' -require 'active_support/testing/deprecation' -require 'active_support/testing/declarative' - begin - gem 'mocha', '>= 0.9.0' + gem 'mocha', '>= 0.9.3' require 'mocha' - - if defined?(MiniTest) - require 'active_support/testing/mocha_minitest_adapter' - end rescue LoadError # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh. Object.const_set :Mocha, Module.new Mocha.const_set :ExpectationError, Class.new(StandardError) end +require 'test/unit/testcase' +require 'active_support/testing/setup_and_teardown' +require 'active_support/testing/assertions' +require 'active_support/testing/deprecation' +require 'active_support/testing/declarative' + module ActiveSupport class TestCase < ::Test::Unit::TestCase if defined? MiniTest diff --git a/activesupport/lib/active_support/testing/mocha_minitest_adapter.rb b/activesupport/lib/active_support/testing/mocha_minitest_adapter.rb deleted file mode 100644 index a96ce74526..0000000000 --- a/activesupport/lib/active_support/testing/mocha_minitest_adapter.rb +++ /dev/null @@ -1,45 +0,0 @@ -class MiniTest::Unit::TestCase - include Mocha::Standalone - - class MochaAssertionCounter - def initialize(runner) @runner = runner end - def increment; @runner.assertion_count += 1 end - end - - def run(runner) - assertion_counter = MochaAssertionCounter.new(runner) - result = '.' - begin - begin - @passed = nil - setup - __send__ name - mocha_verify(assertion_counter) - @passed = true - rescue Exception => e - @passed = false - result = runner.puke(self.class, self.name, e) - ensure - begin - teardown - rescue Exception => e - result = runner.puke(self.class, self.name, e) - end - end - ensure - mocha_teardown - end - result - end -end - -module Test - module Unit - remove_const :TestCase - - class TestCase < MiniTest::Unit::TestCase - include Test::Unit::Assertions - def self.test_order; :sorted end - end - end -end |