mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 12:46:07 +10:00
Robert SpeicherandRobert Speicher
0b7e1e9eb2
Ensure Gravatar host looks like an actual host Solves #10243. I've chosen to simplify the method that extracts the host: since we only need the host, let's get rid of the path and thus get rid of the escaping problems! Unit tests should ensure that most of the cases are covered. See merge request !2482
45 lines
2.3 KiB
Ruby
45 lines
2.3 KiB
Ruby
require_relative '../../config/initializers/1_settings'
|
|
|
|
describe Settings, lib: true do
|
|
|
|
describe '#host_without_www' do
|
|
context 'URL with protocol' do
|
|
it 'returns the host' do
|
|
expect(Settings.host_without_www('http://foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('http://www.foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('http://secure.foo.com')).to eq 'secure.foo.com'
|
|
expect(Settings.host_without_www('http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
|
|
|
|
expect(Settings.host_without_www('https://foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('https://www.foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('https://secure.foo.com')).to eq 'secure.foo.com'
|
|
expect(Settings.host_without_www('https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'secure.gravatar.com'
|
|
end
|
|
end
|
|
|
|
context 'URL without protocol' do
|
|
it 'returns the host' do
|
|
expect(Settings.host_without_www('foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('www.foo.com')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('secure.foo.com')).to eq 'secure.foo.com'
|
|
expect(Settings.host_without_www('www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
|
|
end
|
|
|
|
context 'URL with user/port' do
|
|
it 'returns the host' do
|
|
expect(Settings.host_without_www('bob:pass@foo.com:8080')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('bob:pass@www.foo.com:8080')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('bob:pass@secure.foo.com:8080')).to eq 'secure.foo.com'
|
|
expect(Settings.host_without_www('bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
|
|
|
|
expect(Settings.host_without_www('http://bob:pass@foo.com:8080')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('http://bob:pass@www.foo.com:8080')).to eq 'foo.com'
|
|
expect(Settings.host_without_www('http://bob:pass@secure.foo.com:8080')).to eq 'secure.foo.com'
|
|
expect(Settings.host_without_www('http://bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
end
|