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 --- spec/controllers/concerns/issuable_actions_spec.rb | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 spec/controllers/concerns/issuable_actions_spec.rb (limited to 'spec/controllers/concerns') 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 -- cgit v1.2.3