summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-08-31 12:15:20 +0200
committerAzul <azul@riseup.net>2016-09-10 08:15:47 +0200
commitf18d698d09afda894a568de79c5770704a0c9de7 (patch)
treec7f41e9fff1345a95c781efa0ea5324ea643f0f7 /test
parent625416ac16a1216240fc4c48aa19802ef8a967a1 (diff)
refactor: remove global require in test_helper
require all the things we depend upon where we depend upon them.
Diffstat (limited to 'test')
-rw-r--r--test/integration/hkp_test.rb1
-rw-r--r--test/integration/nickserver_test.rb1
-rw-r--r--test/support/request_handler_test_helper.rb2
-rw-r--r--test/test_helper.rb3
4 files changed, 5 insertions, 2 deletions
diff --git a/test/integration/hkp_test.rb b/test/integration/hkp_test.rb
index 09673cf..bf78bb3 100644
--- a/test/integration/hkp_test.rb
+++ b/test/integration/hkp_test.rb
@@ -1,6 +1,5 @@
require 'test_helper'
require 'nickserver/hkp/source'
-require 'nickserver/adapters/celluloid_http'
class HkpTest < Minitest::Test
diff --git a/test/integration/nickserver_test.rb b/test/integration/nickserver_test.rb
index 9aac6b4..bdba6b7 100644
--- a/test/integration/nickserver_test.rb
+++ b/test/integration/nickserver_test.rb
@@ -1,4 +1,5 @@
require 'test_helper'
+require 'nickserver/server'
require 'json'
#
diff --git a/test/support/request_handler_test_helper.rb b/test/support/request_handler_test_helper.rb
index dd6940d..c063108 100644
--- a/test/support/request_handler_test_helper.rb
+++ b/test/support/request_handler_test_helper.rb
@@ -1,3 +1,5 @@
+require 'nickserver/request'
+
module RequestHandlerTestHelper
protected
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1ed2a98..9f2c581 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,10 +8,11 @@ silence_warnings do
require 'webmock/minitest'
end
require 'celluloid/test'
-require 'nickserver'
require 'minitest/pride'
require 'minitest/hell'
+require 'nickserver/config'
+
TESTING = true
class Minitest::Test