[DRE-commits] [ruby-wikicloth] 04/13: Add patch for rearranging test requires

[Per Andersson]

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

avtobiff-guest pushed a commit to branch master
in repository ruby-wikicloth.

commit 5ed7b9873c4081f8d69b16030ad5bc52d6407520
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Feb 27 01:26:23 2014 +0100

    Add patch for rearranging test requires
    
    In order to get tests running the active_support/test_case require in
    test_helper.rb needs test/unit to be required first.
---
 .../patches/0006-Rearrange-test-unit-require.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0006-Rearrange-test-unit-require.patch b/debian/patches/0006-Rearrange-test-unit-require.patch
new file mode 100644
index 0000000..c8dfd69
--- /dev/null
+++ b/debian/patches/0006-Rearrange-test-unit-require.patch
@@ -0,0 +1,24 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Thu, 27 Feb 2014 01:19:44 +0100
+Subject: Rearrange test/unit require
+
+The require active_support/test_case needs test/unit to be required
+first.
+---
+ test/test_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index fb6c091..a73cd8d 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,8 +1,8 @@
+ 
+ #require 'rubygems'
+ #gem "test-unit", ">= 2.0.5"
++require 'test/unit'
+ require 'active_support'
+ require 'active_support/test_case'
+-require 'test/unit'
+ I18n.load_path << File.join(File.dirname(__FILE__),'locales.yml')
+ require File.join(File.dirname(__FILE__),'../init')
diff --git a/debian/patches/series b/debian/patches/series
index 6ec0c4a..53ef747 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Ignore-code-coverage-test.patch
 0004-Remove-gem-explicit-versioning.patch
 0005-Use-i18n-gem-instead-of-wikicloth-i18n.patch
+0006-Rearrange-test-unit-require.patch

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