summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2016-10-17 08:58:08 +0000
committerazul <azul@riseup.net>2016-10-17 08:58:08 +0000
commit5dae257996c480c3f7b5a220fcaf97812a560466 (patch)
tree2edc9f7b40d7b04e4cf739e6e92b200f93cd57e7 /test/support
parent6721f0732facd87404eecc288357fd1bd0de48cf (diff)
parent5967c4a568aff2c5e73e3ab933aa68d25387aeb1 (diff)
Merge branch 'feature/log-requests-and-errors' into 'master'
Log requests and errors proper logging See merge request !6
Diffstat (limited to 'test/support')
-rw-r--r--test/support/celluloid_test.rb (renamed from test/support/client_integration_test.rb)3
-rw-r--r--test/support/http_stub_helper.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/test/support/client_integration_test.rb b/test/support/celluloid_test.rb
index b05db73..ddcfcbb 100644
--- a/test/support/client_integration_test.rb
+++ b/test/support/celluloid_test.rb
@@ -1,8 +1,9 @@
-class ClientIntegrationTest
+class CelluloidTest < Minitest::Test
def setup
super
Celluloid.boot
+ Celluloid.logger = nil
end
def teardown
diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb
index cb9b578..dd3d1b2 100644
--- a/test/support/http_stub_helper.rb
+++ b/test/support/http_stub_helper.rb
@@ -1,7 +1,9 @@
+require 'nickserver/source'
+
module HttpStubHelper
def stubbing_http
- Nickserver::Adapters::CelluloidHttp.stub :new, adapter do
+ Nickserver::Source::DEFAULT_ADAPTER_CLASS.stub :new, adapter do
yield
end
adapter.verify