summaryrefslogtreecommitdiff
path: root/test/test_helper.rb
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-02-04 10:33:27 -0800
committerjessib <jessib@riseup.net>2014-02-04 10:33:27 -0800
commitc7f376cdc02fe10c7e2a51c7d52475ab34451577 (patch)
tree75c52cbbd43bb55d155c301855677fcba123a2c7 /test/test_helper.rb
parentcda7ebacf35bcc0fcf233e5a23b958ed751fb108 (diff)
parentc3cb71ca5e6d32960e4493d85799f3706ea91fe8 (diff)
Merge pull request #9 from azul/test/integration-with-travis
Test/integration with travis
Diffstat (limited to 'test/test_helper.rb')
-rw-r--r--test/test_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3857e2c..da8b88c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,5 +6,9 @@ $:.unshift File.expand_path('lib', BASE_DIR)
require 'mocha/setup'
-TAPICERO_CONFIG = "test/config/config.yaml"
+require 'tapicero/version'
+Tapicero::CONFIGS << "test/config.yaml"
require 'tapicero'
+
+
+require_relative 'support/integration_test'