diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /spec/lib/request_spec.rb | |
parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'spec/lib/request_spec.rb')
-rw-r--r-- | spec/lib/request_spec.rb | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb index 782f14b18..dc7daa52c 100644 --- a/spec/lib/request_spec.rb +++ b/spec/lib/request_spec.rb @@ -38,17 +38,32 @@ describe Request do end describe '#perform' do - before do - stub_request(:get, 'http://example.com') - subject.perform - end + context 'with valid host' do + before do + stub_request(:get, 'http://example.com') + subject.perform + end + + it 'executes a HTTP request' do + expect(a_request(:get, 'http://example.com')).to have_been_made.once + end - it 'executes a HTTP request' do - expect(a_request(:get, 'http://example.com')).to have_been_made.once + it 'sets headers' do + expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made + end end - it 'sets headers' do - expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made + context 'with private host' do + around do |example| + WebMock.disable! + example.run + WebMock.enable! + end + + it 'raises Mastodon::ValidationError' do + allow(IPSocket).to receive(:getaddress).with('example.com').and_return('0.0.0.0') + expect{ subject.perform }.to raise_error Mastodon::ValidationError + end end end end |