[DRE-commits] [ruby-rack-piwik] 02/04: do not specify path for rack/piwik in test helper

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rack-piwik.

commit d9fc48f12575dac0e4c256cfb05d5c6d2b51e374
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Sep 25 17:01:51 2013 +0200

    do not specify path for rack/piwik in test helper
---
 debian/patches/series                              |    1 +
 debian/patches/unspecify_path_require_helper.patch |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 53f3213..b8e8339 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 move_templates.patch
+unspecify_path_require_helper.patch
diff --git a/debian/patches/unspecify_path_require_helper.patch b/debian/patches/unspecify_path_require_helper.patch
new file mode 100644
index 0000000..8368463
--- /dev/null
+++ b/debian/patches/unspecify_path_require_helper.patch
@@ -0,0 +1,18 @@
+Description: do not specify the path when requiring piwik
+ We want to use the one installed in debian/ruby-rack-piwik and not
+ the one in lib/, since it is patched to cope with the move of templates.
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Description: 2013-09-25
+
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -3,7 +3,7 @@
+ require 'shoulda'
+ require 'rack'
+ require 'rack/test'
+-require File.expand_path('../../lib/rack/piwik',__FILE__)
++require 'rack/piwik'
+ 
+ class Test::Unit::TestCase
+   include Rack::Test::Methods

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