[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master, updated. debian/3.2.13-7-4-g11b4693

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 11b46933998b8bed8c768bc275234d7cdffd1792
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 5 19:20:49 2013 +0530

    port to minitest

diff --git a/debian/changelog b/debian/changelog
index cb0e35b..a37441b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-actionpack-3.2 (3.2.13-8) UNRELEASED; urgency=low
 
-  * 
+  [ Praveen Arimbrathodiyil ]
+  * require minitest instead of test/unit
+    debian/patches/port-to-minitest.patch
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 04 Jun 2013 18:53:13 -0300
 
diff --git a/debian/patches/port-to-minitest.patch b/debian/patches/port-to-minitest.patch
new file mode 100644
index 0000000..060fed8
--- /dev/null
+++ b/debian/patches/port-to-minitest.patch
@@ -0,0 +1,16 @@
+Description: use minitest instead of test/unit
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709431#20
+Last-update: 2013-06-05
+
+--- a/lib/action_dispatch/testing/integration.rb
++++ b/lib/action_dispatch/testing/integration.rb
+@@ -4,7 +4,7 @@
+ require 'active_support/core_ext/object/inclusion'
+ require 'active_support/core_ext/object/try'
+ require 'rack/test'
+-require 'test/unit/assertions'
++require 'minitest'
+ 
+ module ActionDispatch
+   module Integration #:nodoc:
diff --git a/debian/patches/series b/debian/patches/series
index f2c3aa5..f559359 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-allow_newer_rack_versions.patch
 0004-allow_newer_versions.patch
 rack-1.5.patch
+port-to-minitest.patch

-- 
ruby-actionpack-3.2.git