diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-05-26 12:24:43 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 12:24:43 +0930 |
| commit | 4cfcf1ee542706c92c6c9b2e973e81b673fb220f (patch) | |
| tree | 3bd9ec449ab553c73f34ec018f5450938b6831c7 /activemodel/Rakefile | |
| parent | 881823176a3fcaa3711900f2cdfd66b11a6df18a (diff) | |
| parent | 40bdbce191ad90dfea43dad51fac5c4726b89392 (diff) | |
| download | rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.gz rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.tar.bz2 rails-4cfcf1ee542706c92c6c9b2e973e81b673fb220f.zip | |
Merge pull request #29176 from bogdanvlviv/define-path-with__dir__
Define path with __dir__
Diffstat (limited to 'activemodel/Rakefile')
| -rw-r--r-- | activemodel/Rakefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activemodel/Rakefile b/activemodel/Rakefile index c7f97a4258..d60f6d9997 100644 --- a/activemodel/Rakefile +++ b/activemodel/Rakefile @@ -1,14 +1,12 @@ require "rake/testtask" -dir = File.dirname(__FILE__) - task default: :test task :package Rake::TestTask.new do |t| t.libs << "test" - t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb") + t.test_files = Dir.glob("#{__dir__}/test/cases/**/*_test.rb") t.warning = true t.verbose = true t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION) @@ -16,8 +14,8 @@ end namespace :test do task :isolated do - Dir.glob("#{dir}/test/**/*_test.rb").all? do |file| - sh(Gem.ruby, "-w", "-I#{dir}/lib", "-I#{dir}/test", file) + Dir.glob("#{__dir__}/test/**/*_test.rb").all? do |file| + sh(Gem.ruby, "-w", "-I#{__dir__}/lib", "-I#{__dir__}/test", file) end || raise("Failures") end end |