[DRE-commits] [ruby-backports] 01/03: Revert "Stop testing Rails support"

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-backports.

commit 48405667b069c8b48f9d244f7ef3969223cf5eb7
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Sep 2 19:35:27 2014 +0000

    Revert "Stop testing Rails support"
    
    This reverts commit a6b378f1ae5cae20a856ec40a0c4bad425d49adc.
---
 debian/control                           |  2 +-
 debian/patches/do-not-test-rails-support | 24 ------------------------
 debian/patches/series                    |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 334ffb3..fe24faf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Jérémy Bobbio <lunar at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-activesupport
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-backports.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-backports.git;a=summary
diff --git a/debian/patches/do-not-test-rails-support b/debian/patches/do-not-test-rails-support
deleted file mode 100644
index 3c14bc6..0000000
--- a/debian/patches/do-not-test-rails-support
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Do not test Rails support
- activesupport 4 will pull minitest 5 which is incompatible with
- the way backports run its test.
-
-Bug-Debian: http://bugs.debian.org/759897
-Author: Jérémy Bobbio <lunar at debian.org>
-Last-Update: 2014-09-01
-
---- a/test/_backport_guards_test.rb
-+++ b/test/_backport_guards_test.rb
-@@ -138,13 +138,4 @@ class AAA_TestBackportGuards < Test::Unit::TestCase
-     require 'backports/1.8.7/enumerator/next'
-     assert_equal 1, [1,2,3].each.next # [Bug #70]
-   end
--
--  def test_rails
--    require 'active_support/all'
--    $stderr.string = '' # disregard warnings by Rails
--    before = digest
--    require "backports/rails"
--    after = digest
--    assert_nil digest_delta(before, after)
--  end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 4704e3e..69c63a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-collision-with-hash-function
-do-not-test-rails-support

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