[DRE-commits] [SCM] ruby-instantiator.git branch, master, updated. upstream/0.0.6-6-g9ae0d45

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 5ba31feeca9ef2f0cca7153ce1600a98eb05d534
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun Jan 1 18:15:18 2012 +0100

    fix path of test_helper in require statements of tests

diff --git a/debian/changelog b/debian/changelog
index 9aed95e..21100d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,7 @@ ruby-instantiator (0.0.6-1) UNRELEASED; urgency=low
   * Initial release (Closes: #nnnn)
   * 0100_remove_rubygems_bundler_stuff.patch: remove require statements on
     rubygems and bundler from tests.
+  * 0200_fix_path_in_require.patch: fix path of test_helper in require
+    statement of tests.
 
  -- Cédric Boutillier <cedric.boutillier at gmail.com>  Fri, 30 Dec 2011 16:32:49 +0100
diff --git a/debian/patches/0200_fix_path_in_require.patch b/debian/patches/0200_fix_path_in_require.patch
new file mode 100644
index 0000000..693a05b
--- /dev/null
+++ b/debian/patches/0200_fix_path_in_require.patch
@@ -0,0 +1,34 @@
+Description: Fix path in the require statement of the tests.
+ The test/ directory is not in $LOAD_PATH.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-01-01
+--- a/test/instantiator_test.rb
++++ b/test/instantiator_test.rb
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ require "instantiator"
+ 
+ class InstantiatorTest < Test::Unit::TestCase
+@@ -202,4 +202,4 @@
+     assert_equal "Proc.instantiate is not yet supported", e.message
+   end
+ 
+-end
+\ No newline at end of file
++end
+--- a/test/method_invocation_sink_test.rb
++++ b/test/method_invocation_sink_test.rb
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ require "instantiator"
+ 
+ class MethodInvocationSinkTest < Test::Unit::TestCase
+@@ -24,4 +24,4 @@
+   def test_should_return_instance_of_hash
+     assert_instance_of Hash, @sink.to_hash
+   end
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index d1af466..2dc38aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0100_remove_rubygems_bundler_stuff.patch
+0200_fix_path_in_require.patch

-- 
ruby-instantiator.git