Merge pull request #8169 from nicolasdespres/robust_git_repository_check

Rake test:uncommitted finds git directory in ancestors.

3 files changed, 32 insertions, 1 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8538d5fbfa..a0545916ca 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Rake test:uncommitted finds git directory in ancestors *Nicolas Despres*
+
 *   Add dummy app Rake tasks when --skip-test-unit and --dummy-path is passed to the plugin generator.
     Fix #8121
 
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index cd59fbe599..9ad3a4e6d6 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -88,7 +88,7 @@ namespace :test do
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
-      elsif File.directory?(".git")
+      elsif system "git rev-parse --git-dir 2>&1 >/dev/null"
         changed_since_checkin = silence_stderr { `git ls-files --modified --others --exclude-standard` }.split.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c5a68a5152..c6aea03d8c 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -106,6 +106,35 @@ module ApplicationTests
       end
     end
 
+    def test_rake_test_uncommitted_always_find_git_in_parent_dir
+      app_name = File.basename(app_path)
+      app_dir = File.dirname(app_path)
+      moved_app_name = app_name + '_moved'
+      moved_app_path = "#{app_path}/#{moved_app_name}"
+
+      Dir.chdir(app_dir) do
+        # Go from "./app/" to "./app/app_moved"
+        FileUtils.mv(app_name, moved_app_name)
+        FileUtils.mkdir(app_name)
+        FileUtils.mv(moved_app_name, app_name)
+        # Initialize the git repository and start the test.
+        Dir.chdir(app_name) do
+          `git init`
+          Dir.chdir(moved_app_name){ `rake db:migrate` }
+          silence_stderr { Dir.chdir(moved_app_name) { `rake test:uncommitted` } }
+          assert_equal 0, $?.exitstatus
+        end
+      end
+    end
+
+    def test_rake_test_uncommitted_fails_with_no_scm
+      Dir.chdir(app_path){ `rake db:migrate` }
+      Dir.chdir(app_path) do
+        silence_stderr { `rake test:uncommitted` }
+        assert_equal 1, $?.exitstatus
+      end
+    end
+
     def test_rake_routes_calls_the_route_inspector
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do