[DRE-commits] [gem2deb] 03/04: Load test helpers with require_relative

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository gem2deb.

commit 8edc9886fdc01c96b1cf510a480203e349de88f6
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Feb 6 14:16:20 2015 -0200

    Load test helpers with require_relative
    
    This makes the need to pass -Ilib:test when running individual test
    files go away.
---
 test/integration/dh_make_ruby_integration_test.rb | 2 +-
 test/integration/dh_ruby_fixdepends_test.rb       | 2 +-
 test/integration/gem2deb_test.rb                  | 2 +-
 test/test_helper.rb                               | 7 ++++++-
 test/unit/dh_make_ruby_test.rb                    | 2 +-
 test/unit/dh_ruby_test.rb                         | 2 +-
 test/unit/extension_builder_test.rb               | 2 +-
 test/unit/gem2tgz_test.rb                         | 2 +-
 test/unit/installer_test.rb                       | 2 +-
 test/unit/metadata_test.rb                        | 2 +-
 test/unit/secure_code_test.rb                     | 2 +-
 test/unit/setup_rb_installer_test.rb              | 2 +-
 test/unit/test_runner_test.rb                     | 2 +-
 13 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/test/integration/dh_make_ruby_integration_test.rb b/test/integration/dh_make_ruby_integration_test.rb
index 9d33c8a..1bc9d2e 100644
--- a/test/integration/dh_make_ruby_integration_test.rb
+++ b/test/integration/dh_make_ruby_integration_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class DhMakeRubyIntegrationTest < Gem2DebTestCase
 
diff --git a/test/integration/dh_ruby_fixdepends_test.rb b/test/integration/dh_ruby_fixdepends_test.rb
index bd2b8c3..2de8b6a 100644
--- a/test/integration/dh_ruby_fixdepends_test.rb
+++ b/test/integration/dh_ruby_fixdepends_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class DhRubyFixDependsTest < Gem2DebTestCase
 
diff --git a/test/integration/gem2deb_test.rb b/test/integration/gem2deb_test.rb
index b66bdde..afc605a 100644
--- a/test/integration/gem2deb_test.rb
+++ b/test/integration/gem2deb_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class Gem2DebTest < Gem2DebTestCase
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1cbe137..84b0419 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,8 @@
+unless ENV['ADTTMP']
+  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+end
+
+
 require 'test/unit'
 require 'shoulda-context'
 require 'mocha/setup'
@@ -22,7 +27,7 @@ class Gem2DebTestCase
       `#{Gem2Deb::SUPPORTED_RUBY_VERSIONS[version]} -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']"`.strip
   end
 
-  require 'test_helper/samples'
+  require_relative 'test_helper/samples'
   include Gem2DebTestCase::Samples
 
   GEM2DEB_ROOT_SOURCE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
diff --git a/test/unit/dh_make_ruby_test.rb b/test/unit/dh_make_ruby_test.rb
index a20d4a5..c14a2ed 100644
--- a/test/unit/dh_make_ruby_test.rb
+++ b/test/unit/dh_make_ruby_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/gem2tgz'
 require 'gem2deb/dh_make_ruby'
 
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index 57b8f8b..36caa94 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/gem2tgz'
 require 'gem2deb/dh_make_ruby'
 require 'gem2deb/dh_ruby'
diff --git a/test/unit/extension_builder_test.rb b/test/unit/extension_builder_test.rb
index de32e5b..acff1de 100644
--- a/test/unit/extension_builder_test.rb
+++ b/test/unit/extension_builder_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/extension_builder'
 
 class ExtensionBuilderTest < Gem2DebTestCase
diff --git a/test/unit/gem2tgz_test.rb b/test/unit/gem2tgz_test.rb
index aa26f96..3319e8e 100644
--- a/test/unit/gem2tgz_test.rb
+++ b/test/unit/gem2tgz_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'yaml'
 require 'rubygems'
 
diff --git a/test/unit/installer_test.rb b/test/unit/installer_test.rb
index e9b5144..7466567 100644
--- a/test/unit/installer_test.rb
+++ b/test/unit/installer_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/installer'
 
 class InstallerTest < Gem2DebTestCase
diff --git a/test/unit/metadata_test.rb b/test/unit/metadata_test.rb
index cbc72f0..f416a29 100644
--- a/test/unit/metadata_test.rb
+++ b/test/unit/metadata_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/metadata'
 require 'yaml'
 
diff --git a/test/unit/secure_code_test.rb b/test/unit/secure_code_test.rb
index cb48205..b5e1dee 100644
--- a/test/unit/secure_code_test.rb
+++ b/test/unit/secure_code_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 
 class SecureCodeTest < Gem2DebTestCase
 
diff --git a/test/unit/setup_rb_installer_test.rb b/test/unit/setup_rb_installer_test.rb
index 102403f..8b5be3a 100644
--- a/test/unit/setup_rb_installer_test.rb
+++ b/test/unit/setup_rb_installer_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/gem2tgz'
 require 'gem2deb/dh_make_ruby'
 require 'gem2deb/dh_ruby'
diff --git a/test/unit/test_runner_test.rb b/test/unit/test_runner_test.rb
index 80cea69..4e609eb 100644
--- a/test/unit/test_runner_test.rb
+++ b/test/unit/test_runner_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'gem2deb/test_runner'
 
 class TestRunnerTest < Gem2DebTestCase

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git