diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 18:10:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 18:10:29 +0300 |
commit | ef8c47e97e1c178291e4857314a3f53875d75062 (patch) | |
tree | 89ef0c1cd34e864aad1346a0ee07bccb81a9ac65 /spec/services | |
parent | f2ebc27236ecef67e67da1da864bbf58e9b9c267 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services')
6 files changed, 7 insertions, 75 deletions
diff --git a/spec/services/bulk_create_integration_service_spec.rb b/spec/services/bulk_create_integration_service_spec.rb index 674382ee14f..3ac993972c6 100644 --- a/spec/services/bulk_create_integration_service_spec.rb +++ b/spec/services/bulk_create_integration_service_spec.rb @@ -43,46 +43,6 @@ RSpec.describe BulkCreateIntegrationService do end end - shared_examples 'updates project callbacks' do - it 'updates projects#has_external_issue_tracker for issue tracker services' do - described_class.new(integration, batch, association).execute - - expect(project.reload.has_external_issue_tracker).to eq(true) - expect(excluded_project.reload.has_external_issue_tracker).to eq(false) - end - - context 'with an external wiki integration' do - before do - integration.update!(category: 'common', type: 'ExternalWikiService') - end - - it 'updates projects#has_external_wiki for external wiki services' do - described_class.new(integration, batch, association).execute - - expect(project.reload.has_external_wiki).to eq(true) - expect(excluded_project.reload.has_external_wiki).to eq(false) - end - end - end - - shared_examples 'does not update project callbacks' do - it 'does not update projects#has_external_issue_tracker for issue tracker services' do - described_class.new(integration, batch, association).execute - - expect(project.reload.has_external_issue_tracker).to eq(false) - end - - context 'with an inactive external wiki integration' do - let(:integration) { create(:external_wiki_service, :instance, active: false) } - - it 'does not update projects#has_external_wiki for external wiki services' do - described_class.new(integration, batch, association).execute - - expect(project.reload.has_external_wiki).to eq(false) - end - end - end - context 'passing an instance-level integration' do let(:integration) { instance_integration } let(:inherit_from_id) { integration.id } @@ -95,15 +55,6 @@ RSpec.describe BulkCreateIntegrationService do it_behaves_like 'creates integration from batch ids' it_behaves_like 'updates inherit_from_id' - it_behaves_like 'updates project callbacks' - - context 'when integration is not active' do - before do - integration.update!(active: false) - end - - it_behaves_like 'does not update project callbacks' - end end context 'with a group association' do @@ -130,7 +81,6 @@ RSpec.describe BulkCreateIntegrationService do it_behaves_like 'creates integration from batch ids' it_behaves_like 'updates inherit_from_id' - it_behaves_like 'updates project callbacks' end context 'with a group association' do @@ -157,7 +107,6 @@ RSpec.describe BulkCreateIntegrationService do let(:inherit_from_id) { integration.id } it_behaves_like 'creates integration from batch ids' - it_behaves_like 'updates project callbacks' end end end diff --git a/spec/services/feature_flags/create_service_spec.rb b/spec/services/feature_flags/create_service_spec.rb index e115d8098c9..128fab114fe 100644 --- a/spec/services/feature_flags/create_service_spec.rb +++ b/spec/services/feature_flags/create_service_spec.rb @@ -66,18 +66,6 @@ RSpec.describe FeatureFlags::CreateService do subject end - context 'the feature flag is disabled' do - before do - stub_feature_flags(jira_sync_feature_flags: false) - end - - it 'does not sync the feature flag to Jira' do - expect(::JiraConnect::SyncFeatureFlagsWorker).not_to receive(:perform_async) - - subject - end - end - it 'creates audit event' do expected_message = 'Created feature flag <strong>feature_flag</strong> '\ 'with description <strong>"description"</strong>. '\ diff --git a/spec/services/feature_flags/update_service_spec.rb b/spec/services/feature_flags/update_service_spec.rb index 8c4055ddd9e..9639cf3081d 100644 --- a/spec/services/feature_flags/update_service_spec.rb +++ b/spec/services/feature_flags/update_service_spec.rb @@ -26,18 +26,6 @@ RSpec.describe FeatureFlags::UpdateService do expect(subject[:status]).to eq(:success) end - context 'the feature flag is disabled' do - before do - stub_feature_flags(jira_sync_feature_flags: false) - end - - it 'does not sync the feature flag to Jira' do - expect(::JiraConnect::SyncFeatureFlagsWorker).not_to receive(:perform_async) - - subject - end - end - it 'syncs the feature flag to Jira' do expect(::JiraConnect::SyncFeatureFlagsWorker).to receive(:perform_async).with(Integer, Integer) diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb index dc545f57d23..3cf45143594 100644 --- a/spec/services/issues/close_service_spec.rb +++ b/spec/services/issues/close_service_spec.rb @@ -84,6 +84,7 @@ RSpec.describe Issues::CloseService do let!(:external_issue_tracker) { create(:jira_service, project: project) } it 'closes the issue on the external issue tracker' do + project.reload expect(project.external_issue_tracker).to receive(:close_issue) described_class.new(project, user).close_issue(external_issue) @@ -94,6 +95,7 @@ RSpec.describe Issues::CloseService do let!(:external_issue_tracker) { create(:jira_service, project: project, active: false) } it 'does not close the issue on the external issue tracker' do + project.reload expect(project.external_issue_tracker).not_to receive(:close_issue) described_class.new(project, user).close_issue(external_issue) @@ -104,6 +106,7 @@ RSpec.describe Issues::CloseService do let!(:external_issue_tracker) { create(:bugzilla_service, project: project) } it 'does not close the issue on the external issue tracker' do + project.reload expect(project.external_issue_tracker).not_to receive(:close_issue) described_class.new(project, user).close_issue(external_issue) diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index f83b8d98ce8..22b3456708f 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -252,6 +252,7 @@ RSpec.describe MergeRequests::BuildService do issue.update!(iid: 123) else create(:"#{issue_tracker}_service", project: project) + project.reload end end @@ -351,6 +352,7 @@ RSpec.describe MergeRequests::BuildService do issue.update!(iid: 123) else create(:"#{issue_tracker}_service", project: project) + project.reload end end diff --git a/spec/services/system_notes/issuables_service_spec.rb b/spec/services/system_notes/issuables_service_spec.rb index 96afca2f2cb..ae18bc23c17 100644 --- a/spec/services/system_notes/issuables_service_spec.rb +++ b/spec/services/system_notes/issuables_service_spec.rb @@ -729,12 +729,14 @@ RSpec.describe ::SystemNotes::IssuablesService do it 'is false with issue tracker supporting referencing' do create(:jira_service, project: project) + project.reload expect(service.cross_reference_disallowed?(noteable)).to be_falsey end it 'is true with issue tracker not supporting referencing' do create(:bugzilla_service, project: project) + project.reload expect(service.cross_reference_disallowed?(noteable)).to be_truthy end |