Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'"

This reverts merge request !29733

3 files changed, 0 insertions, 107 deletions

diff --git a/spec/controllers/concerns/issuable_actions_spec.rb b/spec/controllers/concerns/issuable_actions_spec.rb
deleted file mode 100644
index 3281fd4a2ef..00000000000
--- a/spec/controllers/concerns/issuable_actions_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe IssuableActions do
-  let(:project) { double('project') }
-  let(:user) { double('user') }
-  let(:issuable) { double('issuable') }
-  let(:finder_params_for_issuable) { {} }
-  let(:notes_result) { double('notes_result') }
-  let(:discussion_serializer) { double('discussion_serializer') }
-
-  let(:controller) do
-    klass = Class.new do
-      attr_reader :current_user, :project, :issuable
-
-      def self.before_action(action, params = nil)
-      end
-
-      include IssuableActions
-
-      def initialize(issuable, project, user, finder_params)
-        @issuable = issuable
-        @project = project
-        @current_user = user
-        @finder_params = finder_params
-      end
-
-      def finder_params_for_issuable
-        @finder_params
-      end
-
-      def params
-        {
-          notes_filter: 1
-        }
-      end
-
-      def prepare_notes_for_rendering(notes)
-        []
-      end
-
-      def render(options)
-      end
-    end
-
-    klass.new(issuable, project, user, finder_params_for_issuable)
-  end
-
-  describe '#discussions' do
-    before do
-      allow(user).to receive(:set_notes_filter)
-      allow(user).to receive(:user_preference)
-      allow(discussion_serializer).to receive(:represent)
-    end
-
-    it 'instantiates and calls NotesFinder as expected' do
-      expect(Discussion).to receive(:build_collection).and_return([])
-      expect(DiscussionSerializer).to receive(:new).and_return(discussion_serializer)
-      expect(NotesFinder).to receive(:new).with(project, user, finder_params_for_issuable).and_call_original
-
-      expect_any_instance_of(NotesFinder).to receive(:execute).and_return(notes_result)
-
-      expect(notes_result).to receive_messages(inc_relations_for_view: notes_result, includes: notes_result, fresh: notes_result)
-
-      controller.discussions
-    end
-  end
-end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 0f885d776e1..32d14dce936 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1260,28 +1260,6 @@ describe Projects::IssuesController do
         sign_in(user)
       end
 
-      context do
-        it_behaves_like 'discussions provider' do
-          let!(:author) { create(:user) }
-          let!(:project) { create(:project) }
-
-          let!(:issue) { create(:issue, project: project, author: user) }
-
-          let!(:note_on_issue1) { create(:discussion_note_on_issue, noteable: issue, project: issue.project, author: create(:user)) }
-          let!(:note_on_issue2) { create(:discussion_note_on_issue, noteable: issue, project: issue.project, author: create(:user)) }
-
-          let(:requested_iid) { issue.iid }
-          let(:expected_discussion_count) { 3 }
-          let(:expected_discussion_ids) do
-            [
-              issue.notes.first.discussion_id,
-              note_on_issue1.discussion_id,
-              note_on_issue2.discussion_id
-            ]
-          end
-        end
-      end
-
       it 'returns discussion json' do
         get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
 
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