diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/services/admin/propagate_integration_service_spec.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/services/admin/propagate_integration_service_spec.rb')
-rw-r--r-- | spec/services/admin/propagate_integration_service_spec.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/services/admin/propagate_integration_service_spec.rb b/spec/services/admin/propagate_integration_service_spec.rb index 13320528e4f..151658fe429 100644 --- a/spec/services/admin/propagate_integration_service_spec.rb +++ b/spec/services/admin/propagate_integration_service_spec.rb @@ -7,20 +7,20 @@ RSpec.describe Admin::PropagateIntegrationService do include JiraServiceHelper before do - stub_jira_service_test + stub_jira_integration_test end let(:group) { create(:group) } let_it_be(:project) { create(:project) } - let_it_be(:instance_integration) { create(:jira_service, :instance) } - let_it_be(:not_inherited_integration) { create(:jira_service, project: project) } + let_it_be(:instance_integration) { create(:jira_integration, :instance) } + let_it_be(:not_inherited_integration) { create(:jira_integration, project: project) } let_it_be(:inherited_integration) do - create(:jira_service, project: create(:project), inherit_from_id: instance_integration.id) + create(:jira_integration, project: create(:project), inherit_from_id: instance_integration.id) end let_it_be(:different_type_inherited_integration) do - create(:redmine_service, project: project, inherit_from_id: instance_integration.id) + create(:redmine_integration, project: project, inherit_from_id: instance_integration.id) end context 'with inherited integration' do @@ -55,7 +55,7 @@ RSpec.describe Admin::PropagateIntegrationService do end context 'for a group-level integration' do - let(:group_integration) { create(:jira_service, group: group, project: nil) } + let(:group_integration) { create(:jira_integration, group: group, project: nil) } context 'with a project without integration' do let(:another_project) { create(:project, group: group) } @@ -81,7 +81,7 @@ RSpec.describe Admin::PropagateIntegrationService do context 'with a subgroup with integration' do let(:subgroup) { create(:group, parent: group) } - let(:subgroup_integration) { create(:jira_service, group: subgroup, project: nil, inherit_from_id: group_integration.id) } + let(:subgroup_integration) { create(:jira_integration, group: subgroup, project: nil, inherit_from_id: group_integration.id) } it 'calls to PropagateIntegrationInheritDescendantWorker' do expect(PropagateIntegrationInheritDescendantWorker).to receive(:perform_async) |