Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2018-01-09 06:51:05 +0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2018-01-22 19:34:51 +0300
commit2e0951e93f15ab3437cb13a1a2be36f45f777c3c (patch)
tree02f91dfa9a177ae84829c1e30ce182222eb06c1b /spec/services/files
parent081a584a35eb44dafd77d212acd9317a7f1414ef (diff)
Incorporate Gitaly's OperationService.UserCommitFiles RPC
Diffstat (limited to 'spec/services/files')
-rw-r--r--spec/services/files/update_service_spec.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb
index 43b0c9a63a9..16bfbdf3089 100644
--- a/spec/services/files/update_service_spec.rb
+++ b/spec/services/files/update_service_spec.rb
@@ -72,13 +72,15 @@ describe Files::UpdateService do
end
end
- context 'when target branch is different than source branch' do
- let(:branch_name) { "#{project.default_branch}-new" }
+ context 'with gitaly disabled', :skip_gitaly_mock do
+ context 'when target branch is different than source branch' do
+ let(:branch_name) { "#{project.default_branch}-new" }
- it 'fires hooks only once' do
- expect(Gitlab::Git::HooksService).to receive(:new).once.and_call_original
+ it 'fires hooks only once' do
+ expect(Gitlab::Git::HooksService).to receive(:new).once.and_call_original
- subject.execute
+ subject.execute
+ end
end
end
end