diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
commit | d80f3cd75e700b6e62910865bfd36734644ffa89 (patch) | |
tree | aa2fa2f2b4385854c13591bef8e74924ef661657 /spec/helpers | |
parent | be81c1578d65f25edfde8aa550f190b8d3e6d976 (diff) | |
download | gitlab-ce-d80f3cd75e700b6e62910865bfd36734644ffa89.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/markup_helper_spec.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb index c22e20f0e73..96c8b557625 100644 --- a/spec/helpers/markup_helper_spec.rb +++ b/spec/helpers/markup_helper_spec.rb @@ -531,8 +531,10 @@ describe MarkupHelper do it 'preserves style attribute for a label that can be accessed by current_user' do project = create(:project, :public) + label = create_and_format_label(project) - expect(create_and_format_label(project)).to match(/span class=.*style=.*/) + expect(label).to match(/span class=.*style=.*/) + expect(label).to include('data-html="true"') end it 'does not style a label that can not be accessed by current_user' do @@ -544,6 +546,15 @@ describe MarkupHelper do end end + it 'keeps whitelisted tags' do + html = '<a><i></i></a> <strong>strong</strong><em>em</em><b>b</b>' + + object = create_object(html) + result = first_line_in_markdown(object, attribute, 100, project: project) + + expect(result).to include(html) + end + it 'truncates Markdown properly' do object = create_object("@#{user.username}, can you look at this?\nHello world\n") actual = first_line_in_markdown(object, attribute, 100, project: project) |