From 887de21aeae8c784ff49c2d34fe2c7606d5bc94e Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 12 May 2013 23:38:36 -0700 Subject: switch to new api for nickserver (get or post, json response) --- test/unit/hkp_test.rb | 12 ++--- test/unit/nickserver_test.rb | 107 +++++++++++++++++++++++++++++++++++++++++++ test/unit/server_test.rb | 30 ------------ 3 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 test/unit/nickserver_test.rb delete mode 100644 test/unit/server_test.rb (limited to 'test/unit') diff --git a/test/unit/hkp_test.rb b/test/unit/hkp_test.rb index c9c28cf..1b7b2c9 100644 --- a/test/unit/hkp_test.rb +++ b/test/unit/hkp_test.rb @@ -28,7 +28,7 @@ class HkpTest < MiniTest::Unit::TestCase def test_key_info_not_found uid = 'leaping_lemur@leap.se' - stub_vindex_response(uid, :status => 404) + stub_sks_vindex_reponse(uid, :status => 404) test_em_errback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'" do |error| assert_equal 404, error end @@ -47,8 +47,8 @@ class HkpTest < MiniTest::Unit::TestCase def test_fetch_key uid = 'cloudadmin@leap.se' key_id = 'E818C478D3141282F7590D29D041EB11B1647490' - stub_vindex_response(uid, :body => file_content(:leap_vindex_result)) - stub_get_response(key_id, :body => file_content(:leap_public_key)) + stub_sks_vindex_reponse(uid, :body => file_content(:leap_vindex_result)) + stub_sks_get_reponse(key_id, :body => file_content(:leap_public_key)) test_em_callback "Nickserver::HKP::FetchKey.new.get '#{uid}'" do |key_text| assert_equal file_content(:leap_public_key), key_text @@ -59,8 +59,8 @@ class HkpTest < MiniTest::Unit::TestCase uid = 'cloudadmin@leap.se' key_id = 'E818C478D3141282F7590D29D041EB11B1647490' - stub_vindex_response(uid, :body => file_content(:leap_vindex_result)) - stub_get_response(key_id, :status => 404) + stub_sks_vindex_reponse(uid, :body => file_content(:leap_vindex_result)) + stub_sks_get_reponse(key_id, :status => 404) test_em_errback "Nickserver::HKP::FetchKey.new.get '#{uid}'" do |error| assert_equal 404, error @@ -113,7 +113,7 @@ class HkpTest < MiniTest::Unit::TestCase end def fetch_key_info(body_source, uid, &block) - stub_vindex_response(uid, :body => file_content(body_source)) + stub_sks_vindex_reponse(uid, :body => file_content(body_source)) test_em_callback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'", &block end diff --git a/test/unit/nickserver_test.rb b/test/unit/nickserver_test.rb new file mode 100644 index 0000000..5753ec3 --- /dev/null +++ b/test/unit/nickserver_test.rb @@ -0,0 +1,107 @@ +require File.expand_path('test_helper', File.dirname(__FILE__)) +require 'json' + +class NickserverTest < MiniTest::Unit::TestCase + + def test_GET_served_via_SKS + uid = 'cloudadmin@leap.se' + key_id = 'E818C478D3141282F7590D29D041EB11B1647490' + stub_sks_vindex_reponse(uid, :body => file_content(:leap_vindex_result)) + stub_sks_get_reponse(key_id, :body => file_content(:leap_public_key)) + + start do + params = {:query => {"address" => uid}} + get(params) do |http| + assert_equal file_content(:leap_public_key), JSON.parse(http.response)["openpgp"] + stop + end + end + end + + def test_POST_served_via_SKS + uid = 'cloudadmin@leap.se' + key_id = 'E818C478D3141282F7590D29D041EB11B1647490' + stub_sks_vindex_reponse(uid, :body => file_content(:leap_vindex_result)) + stub_sks_get_reponse(key_id, :body => file_content(:leap_public_key)) + + start do + params = {:body => {"address" => uid}} + post(params) do |http| + assert_equal file_content(:leap_public_key), JSON.parse(http.response)["openpgp"] + stop + end + end + end + + def test_GET_served_via_couch_not_found + uid = 'bananas@localhost' + key_id = 'E818C478D3141282F7590D29D041EB11B1647490' + stub_couch_response(uid, :body => file_content(uid)) + + start do + params = {:query => {"address" => uid}} + get(params) do |http| + assert_equal 404, http.response_header.status + stop + end + end + end + + protected + + # + # start nickserver + # + def start(timeout = 1) + Timeout::timeout(timeout) do + EM.run do + Nickserver::Server.start + EM.epoll + yield + end + end + rescue Timeout::Error + flunk 'Eventmachine was not stopped before the timeout expired' + end + + # + # http GET requests to nickserver + # + def get(params, &block) + request(:get, params, &block) + end + + # + # http POST requests to nickserver + # + def post(params, &block) + request(:post, params, &block) + end + + # + # http request to nickserver + # + # this works because http requests to localhost are not stubbed, but requests to other domains are. + # + def request(method, params) + http = EventMachine::HttpRequest.new("http://localhost:#{Nickserver::Config.port}/").send(method,params) + + http.callback { + # p http.response_header.status + # p http.response_header + # p http.response + yield http + }.errback { + flunk(http.error) if http.error + EM.stop + } + end + + # + # stop nickserver + # + def stop + EM.stop + end + +end diff --git a/test/unit/server_test.rb b/test/unit/server_test.rb deleted file mode 100644 index 5a6bd8d..0000000 --- a/test/unit/server_test.rb +++ /dev/null @@ -1,30 +0,0 @@ -require File.expand_path('test_helper', File.dirname(__FILE__)) - -class ServerTest < MiniTest::Unit::TestCase - - # - # this test works because http requests to localhost are not stubbed, but requests to other domains are. - # - def test_server - uid = 'cloudadmin@leap.se' - key_id = 'E818C478D3141282F7590D29D041EB11B1647490' - stub_vindex_response(uid, :body => file_content(:leap_vindex_result)) - stub_get_response(key_id, :body => file_content(:leap_public_key)) - - EM.run do - Nickserver::Server.start - params = {:query => {}, :path => "key/#{CGI.escape(uid)}"} - http = EventMachine::HttpRequest.new("http://localhost:#{Nickserver::Config.port}").get(params) - http.callback { - assert_equal file_content(:leap_public_key), http.response - EM.stop - return - }.errback { - flunk http.error - EM.stop - } - end - flunk 'should not get here' - end - -end -- cgit v1.2.3