summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-02-02 19:26:14 +0000
committerDouwe Maan <douwe@gitlab.com>2018-02-02 19:26:14 +0000
commit974bb446bf834bcf3ead9b69b0809e62b28a1bc9 (patch)
tree898d1fa54e02cc870464f79c94e70a43a1714784 /spec/features
parentee600a84d29d1ecbfdb3e9cb1a55c610ed65ab10 (diff)
parent57f8b24fe2d54df4dfcc3ddcb5796e41093f0fd7 (diff)
downloadgitlab-ce-974bb446bf834bcf3ead9b69b0809e62b28a1bc9.tar.gz
Merge branch '24167__color_label' into 'master'
Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/markdown_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index a2b78a5e021..f13d78d24e3 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -259,6 +259,10 @@ describe 'GitLab Markdown' do
it 'includes VideoLinkFilter' do
expect(doc).to parse_video_links
end
+
+ it 'includes ColorFilter' do
+ expect(doc).to parse_colors
+ end
end
context 'wiki pipeline' do
@@ -320,6 +324,10 @@ describe 'GitLab Markdown' do
it 'includes VideoLinkFilter' do
expect(doc).to parse_video_links
end
+
+ it 'includes ColorFilter' do
+ expect(doc).to parse_colors
+ end
end
# Fake a `current_user` helper