summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-28 19:50:53 -0800
committerelijah <elijah@riseup.net>2013-02-28 19:50:53 -0800
commite9a8318dc42146209e4acecc93c4ff62ab6feb7c (patch)
tree4fb6cef95626b708e04b6da93c7b0be7f0fe5718 /test
parent56a42b9858058473a07f254c49d0bb00dadce2d9 (diff)
clean up include paths, require newer rake version.
Diffstat (limited to 'test')
-rw-r--r--test/test_helper.rb2
-rw-r--r--test/unit/command_line_test.rb2
-rw-r--r--test/unit/config_object_list_test.rb2
-rw-r--r--test/unit/config_object_test.rb2
-rw-r--r--test/unit/test_helper.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c75222b..a031caa 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
require 'rubygems'
+require File.expand_path('../../lib/leap_cli/load_paths', __FILE__)
require 'minitest/autorun'
require 'leap_cli'
diff --git a/test/unit/command_line_test.rb b/test/unit/command_line_test.rb
index ec4c2d6..97a4042 100644
--- a/test/unit/command_line_test.rb
+++ b/test/unit/command_line_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('test_helper', File.dirname(__FILE__))
+require File.expand_path('../test_helper', __FILE__)
class CommandLineTest < MiniTest::Unit::TestCase
diff --git a/test/unit/config_object_list_test.rb b/test/unit/config_object_list_test.rb
index ecb6d4e..122c6cd 100644
--- a/test/unit/config_object_list_test.rb
+++ b/test/unit/config_object_list_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
class ConfigObjectListTest < MiniTest::Unit::TestCase
diff --git a/test/unit/config_object_test.rb b/test/unit/config_object_test.rb
index 79cf596..b50318a 100644
--- a/test/unit/config_object_test.rb
+++ b/test/unit/config_object_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('test_helper', File.dirname(__FILE__))
+require File.expand_path('../test_helper', __FILE__)
class ConfigObjectTest < MiniTest::Unit::TestCase
diff --git a/test/unit/test_helper.rb b/test/unit/test_helper.rb
index ade21a0..25a36de 100644
--- a/test/unit/test_helper.rb
+++ b/test/unit/test_helper.rb
@@ -1 +1 @@
-require File.dirname(File.dirname(__FILE__)) + '/test_helper' \ No newline at end of file
+require File.expand_path('../../test_helper', __FILE__)