refactor spec, add docs

3 files changed, 11 insertions, 10 deletions

diff --git a/doc/administration/raketasks/check.md b/doc/administration/raketasks/check.md
index c8b5434c068..7dabc014bad 100644
--- a/doc/administration/raketasks/check.md
+++ b/doc/administration/raketasks/check.md
@@ -34,13 +34,13 @@ This task loops through all repositories on the GitLab server and runs the
 **Omnibus Installation**
 
 ```
-sudo gitlab-rake gitlab:repo:check
+sudo gitlab-rake gitlab:git:fsck
 ```
 
 **Source Installation**
 
 ```bash
-sudo -u git -H bundle exec rake gitlab:repo:check RAILS_ENV=production
+sudo -u git -H bundle exec rake gitlab:git:fsck RAILS_ENV=production
 ```
 
 ### Check repositories for a specific user
diff --git a/lib/tasks/gitlab/git.rake b/lib/tasks/gitlab/git.rake
index 5c1b19860f0..3f5dd2ae3b3 100644
--- a/lib/tasks/gitlab/git.rake
+++ b/lib/tasks/gitlab/git.rake
@@ -36,6 +36,7 @@ namespace :gitlab do
         check_config_lock(repo)
         check_ref_locks(repo)
       end
+
       if failures.empty?
         puts "Done".color(:green)
       else
diff --git a/spec/tasks/gitlab/git_rake_spec.rb b/spec/tasks/gitlab/git_rake_spec.rb
index 44a2607bea2..dacc5dc5ae7 100644
--- a/spec/tasks/gitlab/git_rake_spec.rb
+++ b/spec/tasks/gitlab/git_rake_spec.rb
@@ -1,5 +1,3 @@
-
-
 require 'rake_helper'
 
 describe 'gitlab:git rake tasks' do
@@ -8,8 +6,10 @@ describe 'gitlab:git rake tasks' do
 
     storages = { 'default' => { 'path' => Settings.absolute('tmp/tests/default_storage') } }
 
-    FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@repo/1/2/test.git'))
+    FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/1/2/test.git'))
     allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
+    allow_any_instance_of(String).to receive(:color) { |string, _color| string }
+
     stub_warn_user_is_not_gitlab
   end
 
@@ -18,19 +18,19 @@ describe 'gitlab:git rake tasks' do
   end
 
   describe 'fsck' do
-    it 'outputs the right git command' do
-      expect { run_rake_task('gitlab:git:fsck') }.to output(/Performed Checking integrity/).to_stdout
+    it 'outputs the integrity check for a repo' do
+      expect { run_rake_task('gitlab:git:fsck') }.to output(/Performed Checking integrity at .*@hashed\/1\/2\/test.git/).to_stdout
     end
 
     it 'errors out about config.lock issues' do
-      FileUtils.touch(Settings.absolute('tmp/tests/default_storage/@repo/1/2/test.git/config.lock'))
+      FileUtils.touch(Settings.absolute('tmp/tests/default_storage/@hashed/1/2/test.git/config.lock'))
 
       expect { run_rake_task('gitlab:git:fsck') }.to output(/file exists\? ... yes/).to_stdout
     end
 
     it 'errors out about ref lock issues' do
-      FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@repo/1/2/test.git/refs/heads'))
-      FileUtils.touch(Settings.absolute('tmp/tests/default_storage/@repo/1/2/test.git/refs/heads/blah.lock'))
+      FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/1/2/test.git/refs/heads'))
+      FileUtils.touch(Settings.absolute('tmp/tests/default_storage/@hashed/1/2/test.git/refs/heads/blah.lock'))
 
       expect { run_rake_task('gitlab:git:fsck') }.to output(/Ref lock files exist:/).to_stdout
     end