summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-23 12:10:33 +0000
committerRémy Coutable <remy@rymai.me>2017-05-23 12:10:33 +0000
commit837bd6a6dd31fa407762e21039b47de983fba6c0 (patch)
tree205af5cd6e4fd1a5b056b4132c8ddf4ea12f5b16
parent0e372f96076e149bf694aab5047becde2e3b8b18 (diff)
parent4731ae75c6aaeac76ae9ca549453ff8536b445e5 (diff)
downloadgitlab-ce-837bd6a6dd31fa407762e21039b47de983fba6c0.tar.gz
Merge branch 'fix/transient-service-template-spec' into 'master'
Fix propagate service spec transient failure See merge request !11629
-rw-r--r--spec/services/projects/propagate_service_template_spec.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/services/projects/propagate_service_template_spec.rb b/spec/services/projects/propagate_service_template_spec.rb
index 90eff3bbc1e..8a6a9f09f74 100644
--- a/spec/services/projects/propagate_service_template_spec.rb
+++ b/spec/services/projects/propagate_service_template_spec.rb
@@ -71,14 +71,18 @@ describe Projects::PropagateServiceTemplate, services: true do
end
describe 'bulk update' do
- it 'creates services for all projects' do
- project_total = 5
+ let(:project_total) { 5 }
+
+ before do
stub_const 'Projects::PropagateServiceTemplate::BATCH_SIZE', 3
project_total.times { create(:empty_project) }
- expect { described_class.propagate(service_template) }.
- to change { Service.count }.by(project_total + 1)
+ described_class.propagate(service_template)
+ end
+
+ it 'creates services for all projects' do
+ expect(Service.all.reload.count).to eq(project_total + 2)
end
end