summaryrefslogtreecommitdiff
path: root/spec/helpers/markup_helper_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 15:08:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-25 15:08:50 +0000
commite06d0e779673d745972863302858105aad9032e5 (patch)
tree0ff35b27a949a164f586613004b4abfe33e7d20e /spec/helpers/markup_helper_spec.rb
parentf7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (diff)
downloadgitlab-ce-e06d0e779673d745972863302858105aad9032e5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers/markup_helper_spec.rb')
-rw-r--r--spec/helpers/markup_helper_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index 3fb36e540b6..c22e20f0e73 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -537,8 +537,10 @@ describe MarkupHelper do
it 'does not style a label that can not be accessed by current_user' do
project = create(:project, :private)
+ label = create_and_format_label(project)
- expect(create_and_format_label(project)).to eq("<p>#{label_title}</p>")
+ expect(label).to include("~label_1")
+ expect(label).not_to match(/span class=.*style=.*/)
end
end