diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-12-27 02:34:37 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-12-27 02:34:37 -0800 |
| commit | b33555d3ef26dbe07472c9e1d23f3a6e49a35059 (patch) | |
| tree | 7d927a935491370d36b5490cc8b64827fa5f89f6 | |
| parent | 864514a460d8fdcd8766ca5a9bba2978038985aa (diff) | |
| parent | a9444916ee63a9c5f113a7d4a7e9d6eeb39387b6 (diff) | |
| download | rails-b33555d3ef26dbe07472c9e1d23f3a6e49a35059.tar.gz rails-b33555d3ef26dbe07472c9e1d23f3a6e49a35059.tar.bz2 rails-b33555d3ef26dbe07472c9e1d23f3a6e49a35059.zip | |
Merge pull request #13505 from robin850/patch-13
Ensure backward compatibility between Minitest 5 and 4
| -rw-r--r-- | guides/bug_report_templates/action_controller_gem.rb | 5 | ||||
| -rw-r--r-- | guides/bug_report_templates/active_record_gem.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb index 610eccc039..9387e3dc1d 100644 --- a/guides/bug_report_templates/action_controller_gem.rb +++ b/guides/bug_report_templates/action_controller_gem.rb @@ -29,6 +29,9 @@ end require 'minitest/autorun' require 'rack/test' +# Ensure backward compatibility with Minitest 4 +Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test) + class BugTest < Minitest::Test include Rack::Test::Methods @@ -41,4 +44,4 @@ class BugTest < Minitest::Test def app Rails.application end -end
\ No newline at end of file +end diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb index 63fbe27aed..d72633d0b2 100644 --- a/guides/bug_report_templates/active_record_gem.rb +++ b/guides/bug_report_templates/active_record_gem.rb @@ -4,6 +4,9 @@ require 'active_record' require 'minitest/autorun' require 'logger' +# Ensure backward compatibility with Minitest 4 +Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test) + # This connection will do for database-independent bug reports. ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Base.logger = Logger.new(STDOUT) |