Move GitHooksService to Gitlab::Git

7 files changed, 17 insertions, 17 deletions

diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb
index 4d6fc13557f..d6a6b8fc7d5 100644
--- a/spec/features/tags/master_deletes_tag_spec.rb
+++ b/spec/features/tags/master_deletes_tag_spec.rb
@@ -36,8 +36,8 @@ feature 'Master deletes tag' do
 
   context 'when pre-receive hook fails', js: true do
     before do
-      allow_any_instance_of(GitHooksService).to receive(:execute)
-        .and_raise(GitHooksService::PreReceiveError, 'Do not delete tags')
+      allow_any_instance_of(Gitlab::Git::HooksService).to receive(:execute)
+        .and_raise(Gitlab::Git::HooksService::PreReceiveError, 'Do not delete tags')
     end
 
     scenario 'shows the error message' do
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 80dc49e99cb..295a979da76 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -384,7 +384,7 @@ describe Gitlab::GitAccess do
 
     def stub_git_hooks
       # Running the `pre-receive` hook is expensive, and not necessary for this test.
-      allow_any_instance_of(GitHooksService).to receive(:execute) do |service, &block|
+      allow_any_instance_of(Gitlab::Git::HooksService).to receive(:execute) do |service, &block|
         block.call(service)
       end
     end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 62585fdb35f..462e92b8b62 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -847,7 +847,7 @@ describe Repository, models: true do
 
         expect do
           repository.add_branch(user, 'new_feature', 'master')
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
       end
 
       it 'does not create the branch' do
@@ -855,7 +855,7 @@ describe Repository, models: true do
 
         expect do
           repository.add_branch(user, 'new_feature', 'master')
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
         expect(repository.find_branch('new_feature')).to be_nil
       end
     end
@@ -885,7 +885,7 @@ describe Repository, models: true do
 
     context 'when pre hooks were successful' do
       it 'runs without errors' do
-        expect_any_instance_of(GitHooksService).to receive(:execute)
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:execute)
           .with(committer, repository, old_rev, blank_sha, 'refs/heads/feature')
 
         expect { repository.rm_branch(user, 'feature') }.not_to raise_error
@@ -906,7 +906,7 @@ describe Repository, models: true do
 
         expect do
           repository.rm_branch(user, 'feature')
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
       end
 
       it 'does not delete the branch' do
@@ -914,7 +914,7 @@ describe Repository, models: true do
 
         expect do
           repository.rm_branch(user, 'feature')
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
         expect(repository.find_branch('feature')).not_to be_nil
       end
     end
@@ -926,8 +926,8 @@ describe Repository, models: true do
 
     context 'when pre hooks were successful' do
       before do
-        service = GitHooksService.new
-        expect(GitHooksService).to receive(:new).and_return(service)
+        service = Gitlab::Git::HooksService.new
+        expect(Gitlab::Git::HooksService).to receive(:new).and_return(service)
         expect(service).to receive(:execute)
           .with(committer, repository, old_rev, new_rev, 'refs/heads/feature')
           .and_yield(service).and_return(true)
@@ -1030,7 +1030,7 @@ describe Repository, models: true do
           GitOperationService.new(committer, repository).with_branch('feature') do
             new_rev
           end
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
       end
     end
 
diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb
index cc950ae6bb3..2b4f8cd42ee 100644
--- a/spec/services/files/update_service_spec.rb
+++ b/spec/services/files/update_service_spec.rb
@@ -76,7 +76,7 @@ describe Files::UpdateService do
       let(:branch_name) { "#{project.default_branch}-new" }
 
       it 'fires hooks only once' do
-        expect(GitHooksService).to receive(:new).once.and_call_original
+        expect(Gitlab::Git::HooksService).to receive(:new).once.and_call_original
 
         subject.execute
       end
diff --git a/spec/services/git_hooks_service_spec.rb b/spec/services/git_hooks_service_spec.rb
index 3ce01a995b4..ac7be531526 100644
--- a/spec/services/git_hooks_service_spec.rb
+++ b/spec/services/git_hooks_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GitHooksService do
+describe Gitlab::Git::HooksService do
   include RepoHelpers
 
   let(:user)    { create(:user) }
@@ -31,7 +31,7 @@ describe GitHooksService do
 
         expect do
           service.execute(user, project, @blankrev, @newrev, @ref)
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
       end
     end
 
@@ -43,7 +43,7 @@ describe GitHooksService do
 
         expect do
           service.execute(user, project, @blankrev, @newrev, @ref)
-        end.to raise_error(GitHooksService::PreReceiveError)
+        end.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
       end
     end
   end
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index e593bfeeaf7..5cfdb5372f3 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -217,7 +217,7 @@ describe MergeRequests::MergeService do
       it 'logs and saves error if there is an PreReceiveError exception' do
         error_message = 'error message'
 
-        allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, error_message)
+        allow(service).to receive(:repository).and_raise(Gitlab::Git::HooksService::PreReceiveError, error_message)
         allow(service).to receive(:execute_hooks)
 
         service.execute(merge_request)
diff --git a/spec/services/tags/create_service_spec.rb b/spec/services/tags/create_service_spec.rb
index 1b31ce29f7a..57013b54560 100644
--- a/spec/services/tags/create_service_spec.rb
+++ b/spec/services/tags/create_service_spec.rb
@@ -41,7 +41,7 @@ describe Tags::CreateService do
       it 'returns an error' do
         expect(repository).to receive(:add_tag)
           .with(user, 'v1.1.0', 'master', 'Foo')
-          .and_raise(GitHooksService::PreReceiveError, 'something went wrong')
+          .and_raise(Gitlab::Git::HooksService::PreReceiveError, 'something went wrong')
 
         response = service.execute('v1.1.0', 'master', 'Foo')