Commit 38d57a61 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'qa-escape-netrc-regex' into 'master'

[QA] Escape arg used as regex

Closes gitlab-org/quality/performance#2

See merge request gitlab-org/gitlab-ce!28104
parents 2c3bb832 3554736f
...@@ -251,7 +251,7 @@ module QA ...@@ -251,7 +251,7 @@ module QA
end end
def netrc_already_contains_content? def netrc_already_contains_content?
read_netrc_content.grep(/^#{netrc_content}$/).any? read_netrc_content.grep(/^#{Regexp.escape(netrc_content)}$/).any?
end end
end end
end end
......
...@@ -116,6 +116,15 @@ describe QA::Git::Repository do ...@@ -116,6 +116,15 @@ describe QA::Git::Repository do
expect(File.read(File.join(tmp_netrc_dir, '.netrc'))) expect(File.read(File.join(tmp_netrc_dir, '.netrc')))
.to eq("machine foo login user password foo\n") .to eq("machine foo login user password foo\n")
end end
it 'adds credentials with special characters' do
password = %q[!"#$%&')(*+,-./:;<=>?]
repository.username = 'user'
repository.password = password
expect(File.read(File.join(tmp_netrc_dir, '.netrc')))
.to eq("machine foo login user password #{password}\n")
end
end end
end 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