Commit c52bf4ad authored by Douwe Maan's avatar Douwe Maan Committed by Robert Speicher

Tweak single-word label regex to fix pending spec.

parent b5802d14
...@@ -27,7 +27,7 @@ module Gitlab ...@@ -27,7 +27,7 @@ module Gitlab
~( ~(
(?<label_id>\d+) | # Integer-based label ID, or (?<label_id>\d+) | # Integer-based label ID, or
(?<label_name> (?<label_name>
[^'"&\?,\s]+ | # String-based single-word label title [A-Za-z0-9_-]+ | # String-based single-word label title
['"][^&\?,]+['"] # String-based multi-word label surrounded in quotes ['"][^&\?,]+['"] # String-based multi-word label surrounded in quotes
) )
) )
......
...@@ -84,7 +84,6 @@ module Gitlab::Markdown ...@@ -84,7 +84,6 @@ module Gitlab::Markdown
end end
it 'links with adjacent text' do it 'links with adjacent text' do
skip 'FIXME (rspeicher): This will fail, because a period and parentheses are both currently valid in label names.'
doc = filter("Label (#{reference}.)") doc = filter("Label (#{reference}.)")
expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\))) expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment