diff options
author | José Valim <jose.valim@gmail.com> | 2011-11-08 02:28:41 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-11-08 02:28:41 -0800 |
commit | 1347665d89d3efb2047b5d872b3ac1e2e132f159 (patch) | |
tree | f0b3d61d510e6f9812860074b3cae7b5312f6e27 /railties | |
parent | 805e39b0255a2f132518be69162eb182c8e57f95 (diff) | |
parent | fe67501e62429a8d9c666837740cf9c1de1d4f87 (diff) | |
download | rails-1347665d89d3efb2047b5d872b3ac1e2e132f159.tar.gz rails-1347665d89d3efb2047b5d872b3ac1e2e132f159.tar.bz2 rails-1347665d89d3efb2047b5d872b3ac1e2e132f159.zip |
Merge pull request #3564 from arunagw/uncommitted_rake_fix
Should be checking if file exists or not.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 3d87529ad4..8bcceb9b2c 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -121,10 +121,16 @@ namespace :test do models = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ } controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ } - unit_tests = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" } - functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" } + unit_tests = models.map do |model| + file = "test/unit/#{File.basename(model, '.rb')}_test.rb" + file if File.exist?(file) + end + functional_tests = controllers.map do |controller| + file = "test/functional/#{File.basename(controller, '.rb')}_test.rb" + file if File.exist?(file) + end - unit_tests.uniq + functional_tests.uniq + (unit_tests.uniq + functional_tests.uniq).compact end t.libs << 'test' |