summaryrefslogtreecommitdiff
path: root/spec/workers/merge_worker_spec.rb
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-08-10 18:26:42 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-08-28 15:48:09 -0300
commit9068083f869ff46c2bd3e206b762312150fe8c4e (patch)
tree0240a1b9f829ab309dd65ff89dc97a3531876492 /spec/workers/merge_worker_spec.rb
parent4f17c6b7633c65a9d51dbcd9193914013707e226 (diff)
downloadgitlab-ce-9068083f869ff46c2bd3e206b762312150fe8c4e.tar.gz
Add changelog
Diffstat (limited to 'spec/workers/merge_worker_spec.rb')
-rw-r--r--spec/workers/merge_worker_spec.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb
index ee51000161a..303193bab9b 100644
--- a/spec/workers/merge_worker_spec.rb
+++ b/spec/workers/merge_worker_spec.rb
@@ -27,15 +27,4 @@ describe MergeWorker do
expect(source_project.repository.branch_names).not_to include('markdown')
end
end
-
- it 'persists merge_jid' do
- merge_request = create(:merge_request, merge_jid: nil)
- user = create(:user)
- worker = described_class.new
-
- allow(worker).to receive(:jid) { '999' }
-
- expect { worker.perform(merge_request.id, user.id, {}) }
- .to change { merge_request.reload.merge_jid }.from(nil).to('999')
- end
end