diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-12-29 02:18:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 02:18:38 -0500 |
| commit | eb6a6141a66e052deb58580448d7c0fa6aa675ba (patch) | |
| tree | 0017a57044ec8e466c97cc6b7879d39caa6c1ffa /tools | |
| parent | 447e1a48811fa053e8bef954376d1ad47bdb5cef (diff) | |
| parent | fcec126eaa4f835c837bc75efa78008667b2ec5b (diff) | |
| download | rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.tar.gz rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.tar.bz2 rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.zip | |
Merge branch 'master' into clear_all_environments_log_by_default
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/profile | 2 | ||||
| -rw-r--r-- | tools/test.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/profile b/tools/profile index f7d91e51cf..01e513c67a 100755 --- a/tools/profile +++ b/tools/profile @@ -12,7 +12,7 @@ module CodeTools Error = Class.new(StandardError) attr_reader :path, :mode - def initialize(path, mode=nil) + def initialize(path, mode = nil) assert_ruby_file_exists(path) @path, @mode = path, mode require "benchmark" diff --git a/tools/test.rb b/tools/test.rb index 7819c13ee2..ce546b382d 100644 --- a/tools/test.rb +++ b/tools/test.rb @@ -4,6 +4,8 @@ require "bundler" Bundler.setup require "rails/test_unit/minitest_plugin" +require "rails/test_unit/line_filtering" +require "active_support/test_case" module Rails # Necessary to get rerun-snippts working. @@ -12,4 +14,7 @@ module Rails end end +ActiveSupport::TestCase.extend Rails::LineFiltering Rails::TestUnitReporter.executable = "bin/test" +Minitest.run_via[:rails] = true +require "active_support/testing/autorun" |