diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-09-07 15:29:19 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-09-24 14:02:01 +0300 |
| commit | 81d949f656979429835e0b6059a10a44faba488b (patch) | |
| tree | 671a8927eab32278c656cb24e220ea4df41abd30 /spec/views | |
| parent | 4ce9f2fdfb6d135e6229675b9965c1b90efdfcfe (diff) | |
Applies the CE backport of EE#657
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb | 1 | ||||
| -rw-r--r-- | spec/views/projects/merge_requests/edit.html.haml_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index 8befae39d3a..0206928a211 100644 --- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -12,6 +12,7 @@ describe 'projects/merge_requests/creations/_new_submit.html.haml' do assign(:hidden_commit_count, 0) assign(:total_commit_count, merge_request.commits.count) assign(:project, merge_request.target_project) + assign(:mr_presenter, merge_request.present(current_user: merge_request.author)) allow(view).to receive(:can?).and_return(true) allow(view).to receive(:url_for).and_return('#') diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb index 9b74a7e1946..c13eab30054 100644 --- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb @@ -24,6 +24,7 @@ describe 'projects/merge_requests/edit.html.haml' do before do assign(:project, project) assign(:merge_request, closed_merge_request) + assign(:mr_presenter, closed_merge_request.present(current_user: user)) allow(view).to receive(:can?).and_return(true) allow(view).to receive(:current_user) |