diff options
Diffstat (limited to 'spec/support/shared_contexts/issuable/merge_request_shared_context.rb')
-rw-r--r-- | spec/support/shared_contexts/issuable/merge_request_shared_context.rb | 64 |
1 files changed, 12 insertions, 52 deletions
diff --git a/spec/support/shared_contexts/issuable/merge_request_shared_context.rb b/spec/support/shared_contexts/issuable/merge_request_shared_context.rb index 0fee170a35d..debcd9a3054 100644 --- a/spec/support/shared_contexts/issuable/merge_request_shared_context.rb +++ b/spec/support/shared_contexts/issuable/merge_request_shared_context.rb @@ -1,63 +1,23 @@ # frozen_string_literal: true -RSpec.shared_context 'open merge request show action' do +RSpec.shared_context 'merge request show action' do include Spec::Support::Helpers::Features::MergeRequestHelpers - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } - let(:note) { create(:note_on_merge_request, project: project, noteable: open_merge_request) } - - let(:open_merge_request) do - create(:merge_request, :opened, source_project: project, author: user) - end - - before do - assign(:project, project) - assign(:merge_request, open_merge_request) - assign(:note, note) - assign(:noteable, open_merge_request) - assign(:notes, []) - assign(:pipelines, Ci::Pipeline.none) - assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, open_merge_request)) - - preload_view_requirements(open_merge_request, note) - - sign_in(user) - end -end - -RSpec.shared_context 'closed merge request show action' do - include Devise::Test::ControllerHelpers - include ProjectForksHelper - include Spec::Support::Helpers::Features::MergeRequestHelpers - - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } - let(:forked_project) { fork_project(project, user, repository: true) } - let(:unlink_project) { Projects::UnlinkForkService.new(forked_project, user) } - let(:note) { create(:note_on_merge_request, project: project, noteable: closed_merge_request) } - - let(:closed_merge_request) do - create(:closed_merge_request, - source_project: forked_project, - target_project: project, - author: user) - end + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public, :repository) } + let_it_be(:merge_request) { create(:merge_request, :opened, source_project: project, author: user) } + let_it_be(:note) { create(:note_on_merge_request, project: project, noteable: merge_request) } before do + allow(view).to receive(:experiment_enabled?).and_return(false) + allow(view).to receive(:current_user).and_return(user) assign(:project, project) - assign(:merge_request, closed_merge_request) - assign(:commits_count, 0) + assign(:merge_request, merge_request) assign(:note, note) - assign(:noteable, closed_merge_request) - assign(:notes, []) - assign(:pipelines, Ci::Pipeline.none) - assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request)) - - preload_view_requirements(closed_merge_request, note) + assign(:noteable, merge_request) + assign(:pipelines, []) + assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, merge_request)) - allow(view).to receive_messages(current_user: user, - can?: true, - current_application_settings: Gitlab::CurrentSettings.current_application_settings) + preload_view_requirements(merge_request, note) end end |