summaryrefslogtreecommitdiff
path: root/spec/services/git
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-24 21:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-24 21:09:39 +0000
commitc019f485556acef2baa8e1886559e252710361a0 (patch)
tree52ef90a76fd4d2f6bbda66f2328f875cb2ceaed4 /spec/services/git
parent72875e4a370cf2014e7bb35633d63ccb938e4edb (diff)
downloadgitlab-ce-c019f485556acef2baa8e1886559e252710361a0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/git')
-rw-r--r--spec/services/git/branch_push_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index 5d73794c1ec..c7bf006dab0 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -718,10 +718,10 @@ RSpec.describe Git::BranchPushService, services: true do
end
shared_examples 'enqueues Jira sync worker' do
- specify do
+ specify :aggregate_failures do
Sidekiq::Testing.fake! do
expect(JiraConnect::SyncBranchWorker).to receive(:perform_async)
- .with(project.id, branch_to_sync, commits_to_sync)
+ .with(project.id, branch_to_sync, commits_to_sync, kind_of(Numeric))
.and_call_original
expect { subject.execute }.to change(JiraConnect::SyncBranchWorker.jobs, :size).by(1)