summaryrefslogtreecommitdiff
path: root/spec/frontend/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 21:09:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 21:09:20 +0000
commit06be418a7cd98a1c87c41ba43cca1ce9acbe885e (patch)
tree218a068630ae2dbe87b32a67a7f2b77d631e0db9 /spec/frontend/fixtures
parenteb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (diff)
downloadgitlab-ce-06be418a7cd98a1c87c41ba43cca1ce9acbe885e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r--spec/frontend/fixtures/merge_requests.rb25
1 files changed, 19 insertions, 6 deletions
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index 4f004a69265..be11423ec41 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -10,20 +10,24 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
# rubocop: disable Layout/TrailingWhitespace
+ let(:description) do
+ <<~MARKDOWN.strip_heredoc
+ - [ ] Task List Item
+ - [ ]
+ - [ ] Task List Item 2
+ MARKDOWN
+ end
+ # rubocop: enable Layout/TrailingWhitespace
+
let(:merge_request) do
create(
:merge_request,
:with_diffs,
source_project: project,
target_project: project,
- description: <<~MARKDOWN.strip_heredoc
- - [ ] Task List Item
- - [ ]
- - [ ] Task List Item 2
- MARKDOWN
+ description: description
)
end
- # rubocop: enable Layout/TrailingWhitespace
let(:merged_merge_request) { create(:merge_request, :merged, source_project: project, target_project: project) }
let(:pipeline) do
@@ -122,6 +126,15 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
end
end
+ context 'with mentions' do
+ let(:group) { create(:group) }
+ let(:description) { "@#{group.full_path} @all @#{admin.username}" }
+
+ it 'merge_requests/merge_request_with_mentions.html' do
+ render_merge_request(merge_request)
+ end
+ end
+
private
def render_discussions_json(merge_request)