diff options
author | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
commit | 83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch) | |
tree | e13ad022ea223e7bde5202a31ee81169225fec99 /spec/views | |
parent | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff) | |
parent | 12095251c3777c5231cab97854d5dca69d31cc5d (diff) |
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/merge_requests/show.html.haml_spec.rb | 11 |
1 files changed, 11 insertions, 0 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 fe6ad26a6f6..fa6c4ce4ac8 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -17,6 +17,13 @@ describe 'projects/merge_requests/show.html.haml' do author: user) end + def preload_view_requirements + # This will load the status fields of the author of the note and merge request + # to avoid queries in when rendering the view being tested. + closed_merge_request.author.status + note.author.status + end + before do assign(:project, project) assign(:merge_request, closed_merge_request) @@ -26,6 +33,8 @@ describe 'projects/merge_requests/show.html.haml' do assign(:notes, []) assign(:pipelines, Ci::Pipeline.none) + preload_view_requirements + allow(view).to receive_messages(current_user: user, can?: true, current_application_settings: Gitlab::CurrentSettings.current_application_settings) @@ -42,6 +51,7 @@ describe 'projects/merge_requests/show.html.haml' do it 'does not show the "Reopen" button when the source project does not exist' do unlink_project.execute closed_merge_request.reload + preload_view_requirements render @@ -56,6 +66,7 @@ describe 'projects/merge_requests/show.html.haml' do forked_project.destroy # Reload merge request so MergeRequest#source_project turns to `nil` closed_merge_request.reload + preload_view_requirements render |