diff options
| -rw-r--r-- | nickserver.gemspec | 10 | ||||
| -rw-r--r-- | test/test_helper.rb | 3 | ||||
| -rw-r--r-- | test/unit/hkp_test.rb | 6 | ||||
| -rw-r--r-- | test/unit/nickserver_test.rb | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/nickserver.gemspec b/nickserver.gemspec index 5d0d807..69270cd 100644 --- a/nickserver.gemspec +++ b/nickserver.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |gem| gem.require_paths = ["lib"] gem.add_development_dependency 'rake' - gem.add_development_dependency 'minitest' - gem.add_development_dependency 'webmock' + gem.add_development_dependency 'minitest', '~> 5.2' + gem.add_development_dependency 'webmock', '~> 1.17' - gem.add_dependency 'eventmachine' - gem.add_dependency 'em-http-request' - gem.add_dependency 'eventmachine_httpserver' + gem.add_dependency 'eventmachine', '~> 1.0' + gem.add_dependency 'em-http-request', '~> 1.1' + gem.add_dependency 'eventmachine_httpserver', '~> 0.2' end diff --git a/test/test_helper.rb b/test/test_helper.rb index ec19753..d6eabe5 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,13 +1,14 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') require 'rubygems' +require 'bundler/setup' require 'minitest/autorun' require 'webmock/minitest' require 'nickserver' TESTING = true -class MiniTest::Unit::TestCase +class Minitest::Test # Add global extensions to the test case class here def setup diff --git a/test/unit/hkp_test.rb b/test/unit/hkp_test.rb index c211690..0ac4728 100644 --- a/test/unit/hkp_test.rb +++ b/test/unit/hkp_test.rb @@ -1,6 +1,6 @@ require File.expand_path('test_helper', File.dirname(__FILE__)) -class HkpTest < MiniTest::Unit::TestCase +class HkpTest < Minitest::Test def test_key_info_expired fetch_key_info(:hkp_vindex_result, 'lemur@leap.se') do |keys| @@ -95,9 +95,9 @@ class HkpTest < MiniTest::Unit::TestCase yield response return } - deferrable.errback {|response| + deferrable.errback {|response, msg| EM.stop - flunk "Expecting callback, but errback invoked with response: #{response}" + flunk "Expecting callback, but errback invoked with response: #{response} #{msg}" } end assert false, 'should not get here' diff --git a/test/unit/nickserver_test.rb b/test/unit/nickserver_test.rb index 6a23d0d..c74d3d8 100644 --- a/test/unit/nickserver_test.rb +++ b/test/unit/nickserver_test.rb @@ -14,7 +14,7 @@ require 'json' # default (localhost) to a dummy value (notlocalhost). # -class NickserverTest < MiniTest::Unit::TestCase +class NickserverTest < Minitest::Test def test_GET_served_via_SKS uid = 'cloudadmin@leap.se' |