diff options
author | azul <azul@riseup.net> | 2016-09-23 06:45:18 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2016-09-23 06:45:18 +0000 |
commit | 6721f0732facd87404eecc288357fd1bd0de48cf (patch) | |
tree | 58b0f80b545987d5fc7f3dfdd4a3c1563cbc216e /test/support | |
parent | e2aedcaade71dfe9103fdc8e705f59ece5f3a4d0 (diff) | |
parent | 68ffe9928620d3e5e3b96152ed4d37da90f6a89b (diff) |
Merge branch 'feature/deal-with-network-failures' into 'master'
Feature/deal with network failures
Also activates the new nicknym lookup.
See merge request !5
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/http_stub_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb index 6b05f98..cb9b578 100644 --- a/test/support/http_stub_helper.rb +++ b/test/support/http_stub_helper.rb @@ -7,6 +7,11 @@ module HttpStubHelper adapter.verify end + def stub_nicknym_available_response(domain, response = {}) + stub_http_request :get, "https://#{domain}/provider.json", + response: response + end + def stub_sks_vindex_reponse(uid, response = {}) stub_http_request :get, config.hkp_url, query: {op: 'vindex', search: uid, exact: 'on', options: 'mr', fingerprint: 'on'}, @@ -28,8 +33,9 @@ module HttpStubHelper def stub_http_request(verb, url, options = {}) response = {status: 200, body: ""}.merge(options.delete(:response) || {}) + options = nil if options == {} adapter.expect :get, [response[:status], response[:body]], - [url, options] + [url, options].compact end def adapter |