diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:17 +0000 |
commit | 28fd41cf28bfac77fe877b6cce83594c1f9f21a1 (patch) | |
tree | f40a522a22db6518445b243b5244207416665f01 /spec/services/git/base_hooks_service_spec.rb | |
parent | dbb27a91536f29550f7714356ab499d318e9d7e2 (diff) | |
download | gitlab-ce-28fd41cf28bfac77fe877b6cce83594c1f9f21a1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/git/base_hooks_service_spec.rb')
-rw-r--r-- | spec/services/git/base_hooks_service_spec.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/spec/services/git/base_hooks_service_spec.rb b/spec/services/git/base_hooks_service_spec.rb index 4ab27c7ab05..539c294a2e7 100644 --- a/spec/services/git/base_hooks_service_spec.rb +++ b/spec/services/git/base_hooks_service_spec.rb @@ -59,7 +59,7 @@ RSpec.describe Git::BaseHooksService do end end - describe 'project hooks and services' do + describe 'project hooks and integrations' do context 'hooks' do before do expect(project).to receive(:has_active_hooks?).and_return(active) @@ -88,45 +88,45 @@ RSpec.describe Git::BaseHooksService do end end - context 'services' do + context 'with integrations' do before do - expect(project).to receive(:has_active_services?).and_return(active) + expect(project).to receive(:has_active_integrations?).and_return(active) end - context 'active services' do + context 'with active integrations' do let(:active) { true } it 'executes the services' do expect(subject).to receive(:push_data).at_least(:once).and_call_original - expect(project).to receive(:execute_services) + expect(project).to receive(:execute_integrations) subject.execute end end - context 'inactive services' do + context 'with inactive integrations' do let(:active) { false } it 'does not execute the services' do expect(subject).not_to receive(:push_data) - expect(project).not_to receive(:execute_services) + expect(project).not_to receive(:execute_integrations) subject.execute end end end - context 'execute_project_hooks param set to false' do + context 'when execute_project_hooks param is set to false' do before do params[:execute_project_hooks] = false allow(project).to receive(:has_active_hooks?).and_return(true) - allow(project).to receive(:has_active_services?).and_return(true) + allow(project).to receive(:has_active_integrations?).and_return(true) end - it 'does not execute hooks and services' do + it 'does not execute hooks and integrations' do expect(project).not_to receive(:execute_hooks) - expect(project).not_to receive(:execute_services) + expect(project).not_to receive(:execute_integrations) subject.execute end |