Commit 9ef6d028 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'dm-dependency-linker-newlines' into 'master'

Fix diff of requirements.txt file by not matching newlines as part of package names

Closes #34321

See merge request !12495
parents ccc5bbcd 34f7c3bd
---
title: Fix diff of requirements.txt file by not matching newlines as part of package
names
merge_request:
author:
......@@ -52,7 +52,7 @@ def link_tag(name, url)
# # Will link `user/repo` in `github: "user/repo"` or `:github => "user/repo"`
def link_regex(regex, &url_proc)
highlighted_lines.map!.with_index do |rich_line, i|
marker = StringRegexMarker.new(plain_lines[i], rich_line.html_safe)
marker = StringRegexMarker.new(plain_lines[i].chomp, rich_line.html_safe)
marker.mark(regex, group: :name) do |text, left:, right:|
url = yield(text)
......
......@@ -87,5 +87,9 @@ def link(name, url)
it 'links URLs' do
expect(subject).to include(link('http://wxpython.org/Phoenix/snapshot-builds/wxPython_Phoenix-3.0.3.dev1820+49a8884-cp34-none-win_amd64.whl', 'http://wxpython.org/Phoenix/snapshot-builds/wxPython_Phoenix-3.0.3.dev1820+49a8884-cp34-none-win_amd64.whl'))
end
it 'does not contain link with a newline as package name' do
expect(subject).not_to include(link("\n", "https://pypi.python.org/pypi/\n"))
end
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