Skip to content

Commit

Permalink
Add active_support/testing/autorun
Browse files Browse the repository at this point in the history
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
  • Loading branch information
rafaelfranca committed Dec 31, 2012
1 parent eb4930e commit 5da4d51
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion actionmailer/test/abstract_unit.rb
Expand Up @@ -8,7 +8,7 @@
Encoding.default_external = "UTF-8"
end

require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'action_mailer'
require 'action_mailer/test_case'

Expand Down
2 changes: 1 addition & 1 deletion actionpack/test/abstract_unit.rb
Expand Up @@ -15,7 +15,7 @@
Encoding.default_external = "UTF-8"
end

require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'abstract_controller'
require 'action_controller'
require 'action_view'
Expand Down
2 changes: 1 addition & 1 deletion actionpack/test/dispatch/routing/inspector_test.rb
@@ -1,4 +1,4 @@
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'action_controller'
require 'rails/engine'
require 'action_dispatch/routing/inspector'
Expand Down
2 changes: 1 addition & 1 deletion actionpack/test/ts_isolated.rb
@@ -1,4 +1,4 @@
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'rbconfig'
require 'abstract_unit'

Expand Down
2 changes: 1 addition & 1 deletion activemodel/test/cases/helper.rb
Expand Up @@ -7,4 +7,4 @@
# Show backtraces for deprecated behavior for quicker cleanup.
ActiveSupport::Deprecation.debug = true

require 'minitest/autorun'
require 'active_support/testing/autorun'
3 changes: 1 addition & 2 deletions activerecord/test/cases/helper.rb
Expand Up @@ -2,8 +2,7 @@

require 'config'

gem 'minitest'
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'stringio'

require 'active_record'
Expand Down
1 change: 1 addition & 0 deletions activerecord/test/cases/migration/change_table_test.rb
@@ -1,4 +1,5 @@
require "cases/migration/helper"
require "minitest/mock"

module ActiveRecord
class Migration
Expand Down
5 changes: 5 additions & 0 deletions activesupport/lib/active_support/testing/autorun.rb
@@ -0,0 +1,5 @@
gem 'minitest'

require 'minitest/unit'

MiniTest::Unit.autorun
2 changes: 1 addition & 1 deletion activesupport/test/abstract_unit.rb
Expand Up @@ -15,7 +15,7 @@
Encoding.default_external = "UTF-8"
end

require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'empty_bool'

ENV['NO_RELOAD'] = '1'
Expand Down
2 changes: 1 addition & 1 deletion activesupport/test/ts_isolated.rb
@@ -1,4 +1,4 @@
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'active_support/test_case'
require 'rbconfig'
require 'active_support/core_ext/kernel/reporting'
Expand Down
@@ -1,2 +1,2 @@
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'active_support'
2 changes: 1 addition & 1 deletion railties/lib/rails/test_help.rb
Expand Up @@ -2,7 +2,7 @@
# so fixtures aren't loaded into that environment
abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?

require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'active_support/test_case'
require 'action_controller/test_case'
require 'action_dispatch/testing/integration'
Expand Down
2 changes: 1 addition & 1 deletion railties/test/abstract_unit.rb
Expand Up @@ -3,7 +3,7 @@
require File.expand_path("../../../load_paths", __FILE__)

require 'stringio'
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'fileutils'

require 'active_support'
Expand Down
3 changes: 2 additions & 1 deletion railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,6 +1,7 @@
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'rails/configuration'
require 'active_support/test_case'
require 'minitest/mock'

module Rails
module Configuration
Expand Down
2 changes: 1 addition & 1 deletion railties/test/isolation/abstract_unit.rb
Expand Up @@ -9,7 +9,7 @@
require 'fileutils'

require 'bundler/setup' unless defined?(Bundler)
require 'minitest/autorun'
require 'active_support/testing/autorun'
require 'active_support/test_case'

RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
Expand Down

0 comments on commit 5da4d51

Please sign in to comment.