diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/services/bulk_create_integration_service_spec.rb | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/services/bulk_create_integration_service_spec.rb')
-rw-r--r-- | spec/services/bulk_create_integration_service_spec.rb | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/spec/services/bulk_create_integration_service_spec.rb b/spec/services/bulk_create_integration_service_spec.rb index 4b0029e27cb..517222c0e69 100644 --- a/spec/services/bulk_create_integration_service_spec.rb +++ b/spec/services/bulk_create_integration_service_spec.rb @@ -21,7 +21,7 @@ RSpec.describe BulkCreateIntegrationService do described_class.new(integration, batch, association).execute expect(created_integration.attributes.except(*excluded_attributes)) - .to eq(integration.attributes.except(*excluded_attributes)) + .to eq(integration.reload.attributes.except(*excluded_attributes)) end context 'integration with data fields' do @@ -96,18 +96,4 @@ RSpec.describe BulkCreateIntegrationService do it_behaves_like 'updates inherit_from_id' end end - - context 'passing a template integration' do - let(:integration) { template_integration } - - context 'with a project association' do - let!(:project) { create(:project) } - let(:created_integration) { project.jira_integration } - let(:batch) { Project.where(id: project.id) } - let(:association) { 'project' } - let(:inherit_from_id) { integration.id } - - it_behaves_like 'creates integration from batch ids' - end - end end |