diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 00:06:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 00:06:08 +0000 |
commit | 157f9a451a428f66666ba85d8b880df78aff6cc4 (patch) | |
tree | 7c38cacafb9720d144a6add0a170a07a7cc376f6 /spec/models/project_import_state_spec.rb | |
parent | 7f15e74dae019ac96c65ec769eae2d67aae65a8c (diff) | |
download | gitlab-ce-157f9a451a428f66666ba85d8b880df78aff6cc4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/project_import_state_spec.rb')
-rw-r--r-- | spec/models/project_import_state_spec.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/models/project_import_state_spec.rb b/spec/models/project_import_state_spec.rb index 0b4dcc62ff6..babde7b0670 100644 --- a/spec/models/project_import_state_spec.rb +++ b/spec/models/project_import_state_spec.rb @@ -95,30 +95,28 @@ describe ProjectImportState, type: :model do end end - describe '#remove_jid', :clean_gitlab_redis_cache do - let(:project) { } - + describe 'clearing `jid` after finish', :clean_gitlab_redis_cache do context 'without an JID' do it 'does nothing' do - import_state = create(:import_state) + import_state = create(:import_state, :started) expect(Gitlab::SidekiqStatus) .not_to receive(:unset) - import_state.remove_jid + import_state.finish! end end context 'with an JID' do it 'unsets the JID' do - import_state = create(:import_state, jid: '123') + import_state = create(:import_state, :started, jid: '123') expect(Gitlab::SidekiqStatus) .to receive(:unset) .with('123') .and_call_original - import_state.remove_jid + import_state.finish! expect(import_state.jid).to be_nil end |