Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-01 12:04:32 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-06-01 12:04:32 +0300
commitdd7449b92454dd614b5a60efd5fe44561174d2fa (patch)
treefe2b40361312b766dbade6cfbd1161cb8f11f1cb /spec
parent69e31003beee21d9532bdbad979528a48c230679 (diff)
parent371ae05c15f0a523585c67cdaa15605b617ef037 (diff)
Merge branch 'dm-emails-are-not-user-references' into 'master'
Don't match email addresses or foo@bar as user references See merge request !11837
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/banzai/filter/user_reference_filter_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/lib/banzai/filter/user_reference_filter_spec.rb b/spec/lib/banzai/filter/user_reference_filter_spec.rb
index 63b23dac7ed..edf3846b742 100644
--- a/spec/lib/banzai/filter/user_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/user_reference_filter_spec.rb
@@ -16,6 +16,11 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
expect(reference_filter(act).to_html).to eq(exp)
end
+ it 'ignores references with text before the @ sign' do
+ exp = act = "Hey foo#{reference}"
+ expect(reference_filter(act).to_html).to eq(exp)
+ end
+
%w(pre code a style).each do |elem|
it "ignores valid references contained inside '#{elem}' element" do
exp = act = "<#{elem}>Hey #{reference}</#{elem}>"