diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-01-05 23:34:53 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-05 23:34:53 +0300 |
commit | 32b1ceb03677a7484bf10412fbe67ad94b57d51c (patch) | |
tree | cde572b629a34642f9dbb05057fd5e879205d94f /spec/views | |
parent | 4a1a06f4c6a9fe21504258ac3c1b007853bfd98b (diff) | |
parent | 6e7e5052374d67c0b3ed6cac3f62a29778d10858 (diff) |
Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master'
Resolve "Merge request tabs don't render when no commits available"
Closes #26155 and #24556
See merge request !8347
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/merge_requests/show.html.haml_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index 33cabd14913..7f123b15194 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -7,6 +7,7 @@ describe 'projects/merge_requests/show.html.haml' do let(:project) { create(:project) } let(:fork_project) { create(:project, forked_from_project: project) } let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) } + let(:note) { create(:note_on_merge_request, project: project, noteable: closed_merge_request) } let(:closed_merge_request) do create(:closed_merge_request, @@ -19,8 +20,12 @@ describe 'projects/merge_requests/show.html.haml' do assign(:project, project) assign(:merge_request, closed_merge_request) assign(:commits_count, 0) + assign(:note, note) + assign(:noteable, closed_merge_request) + assign(:notes, []) + assign(:pipelines, Ci::Pipeline.none) - allow(view).to receive(:can?).and_return(true) + allow(view).to receive_messages(current_user: user, can?: true) end context 'when the merge request is closed' do |