From b78954c13d127d84fa1e10db83f51b23790aa526 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Fri, 13 Oct 2017 10:17:41 +0200 Subject: Simplify check for running job on Redis --- spec/lib/gitlab/sidekiq_status_spec.rb | 12 ++++++++++++ spec/models/merge_request_spec.rb | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/lib/gitlab/sidekiq_status_spec.rb b/spec/lib/gitlab/sidekiq_status_spec.rb index c2e77ef6b6c..884f27b212c 100644 --- a/spec/lib/gitlab/sidekiq_status_spec.rb +++ b/spec/lib/gitlab/sidekiq_status_spec.rb @@ -39,6 +39,18 @@ describe Gitlab::SidekiqStatus do end end + describe '.running?', :clean_gitlab_redis_shared_state do + it 'returns true if job is running' do + described_class.set('123') + + expect(described_class.running?('123')).to be(true) + end + + it 'returns false if job is not found' do + expect(described_class.running?('123')).to be(false) + end + end + describe '.num_running', :clean_gitlab_redis_shared_state do it 'returns 0 if all jobs have been completed' do expect(described_class.num_running(%w(123))).to eq(0) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 09d7d0dbbe6..73e038b61ed 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1462,7 +1462,7 @@ describe MergeRequest do describe '#merge_ongoing?' do it 'returns true when merge_id, MR is not merged and it has no running job' do merge_request = build_stubbed(:merge_request, state: :open, merge_jid: 'foo') - allow(Gitlab::SidekiqStatus).to receive(:num_running).with(['foo']) { 1 } + allow(Gitlab::SidekiqStatus).to receive(:running?).with('foo') { true } expect(merge_request.merge_ongoing?).to be(true) end @@ -1481,7 +1481,7 @@ describe MergeRequest do it 'returns false if there is no merge job running' do merge_request = build_stubbed(:merge_request, state: :open, merge_jid: 'foo') - allow(Gitlab::SidekiqStatus).to receive(:num_running).with(['foo']) { 0 } + allow(Gitlab::SidekiqStatus).to receive(:running?).with('foo') { false } expect(merge_request.merge_ongoing?).to be(false) end -- cgit v1.2.1