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:
Diffstat (limited to 'spec/services/bulk_update_integration_service_spec.rb')
-rw-r--r--spec/services/bulk_update_integration_service_spec.rb16
1 files changed, 14 insertions, 2 deletions
diff --git a/spec/services/bulk_update_integration_service_spec.rb b/spec/services/bulk_update_integration_service_spec.rb
index b6b7d1936a2..c10a9b75648 100644
--- a/spec/services/bulk_update_integration_service_spec.rb
+++ b/spec/services/bulk_update_integration_service_spec.rb
@@ -51,11 +51,11 @@ RSpec.describe BulkUpdateIntegrationService do
context 'with inherited integration' do
it 'updates the integration', :aggregate_failures do
- described_class.new(subgroup_integration, batch).execute
+ described_class.new(subgroup_integration.reload, batch).execute
expect(integration.reload.inherit_from_id).to eq(group_integration.id)
expect(integration.reload.attributes.except(*excluded_attributes))
- .to eq(subgroup_integration.attributes.except(*excluded_attributes))
+ .to eq(subgroup_integration.reload.attributes.except(*excluded_attributes))
expect(excluded_integration.reload.inherit_from_id).not_to eq(group_integration.id)
expect(excluded_integration.reload.attributes.except(*excluded_attributes))
@@ -76,4 +76,16 @@ RSpec.describe BulkUpdateIntegrationService do
end
end
end
+
+ it 'works with batch as an ActiveRecord::Relation' do
+ expect do
+ described_class.new(group_integration, Integration.where(id: integration.id)).execute
+ end.to change { integration.reload.url }.to(group_integration.url)
+ end
+
+ it 'works with batch as an array of ActiveRecord objects' do
+ expect do
+ described_class.new(group_integration, [integration]).execute
+ end.to change { integration.reload.url }.to(group_integration.url)
+ end
end