Merge pull request #3564 from arunagw/uncommitted_rake_fix

Should be checking if file exists or not.

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'