summaryrefslogtreecommitdiff
path: root/spec/frontend/fixtures/merge_requests.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
commit4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch)
tree5423a1c7516cffe36384133ade12572cf709398d /spec/frontend/fixtures/merge_requests.rb
parente570267f2f6b326480d284e0164a6464ba4081bc (diff)
downloadgitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/frontend/fixtures/merge_requests.rb')
-rw-r--r--spec/frontend/fixtures/merge_requests.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index 418912638f9..f10f96f2516 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -62,8 +62,14 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type:
remove_repository(project)
end
+ it 'merge_requests/merge_request_with_single_assignee_feature.html' do
+ stub_licensed_features(multiple_merge_request_assignees: false)
+
+ render_merge_request(merge_request)
+ end
+
it 'merge_requests/merge_request_of_current_user.html' do
- merge_request.update(author: user)
+ merge_request.update!(author: user)
render_merge_request(merge_request)
end