From c41788fe54fecf113a31b1aa3238ea22ac1947d5 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 27 Jul 2019 04:28:56 +0000 Subject: Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'" This reverts merge request !29733 --- .../projects/merge_requests_controller_spec.rb | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb') diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 9aa5f1ade8d..fa71d9b61b1 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1120,22 +1120,6 @@ describe Projects::MergeRequestsController do end end end - - context do - it_behaves_like 'discussions provider' do - let!(:author) { create(:user) } - let!(:project) { create(:project) } - - let!(:merge_request) { create(:merge_request, source_project: project) } - - let!(:mr_note1) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } - let!(:mr_note2) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } - - let(:requested_iid) { merge_request.iid } - let(:expected_discussion_count) { 2 } - let(:expected_discussion_ids) { [mr_note1.discussion_id, mr_note2.discussion_id] } - end - end end describe 'GET edit' do -- cgit v1.2.1