[DRE-commits] [ruby-actionpack-action-caching] 04/05: don't use bundler for tests, but use rake

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-actionpack-action-caching.

commit dce998559523ada3ce0fd7a947ed8fb4c221f641
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 29 14:30:26 2014 -0700

    don't use bundler for tests, but use rake
---
 debian/control                                 |  2 +-
 debian/patches/dont-use-bundler-in-tests.patch | 15 +++++++++++++++
 debian/patches/series                          |  1 +
 debian/tests/control                           |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index cd1da42..03aac90 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: Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-mocha, ruby-activerecord
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-mocha, ruby-activerecord, rake
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-actionpack-action-caching.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-actionpack-action-caching.git;a=summary
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
new file mode 100644
index 0000000..4e64995
--- /dev/null
+++ b/debian/patches/dont-use-bundler-in-tests.patch
@@ -0,0 +1,15 @@
+--- a/test/abstract_unit.rb
++++ b/test/abstract_unit.rb
+@@ -1,4 +1,3 @@
+-require 'bundler/setup'
+ require 'minitest/autorun'
+ require 'action_controller'
+ require 'active_record'
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,5 +1,4 @@
+ #!/usr/bin/env rake
+-require 'bundler/gem_tasks'
+ require 'rake/testtask'
+ 
+ Rake::TestTask.new do |t|
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e408c5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-use-bundler-in-tests.patch
diff --git a/debian/tests/control b/debian/tests/control
index 69c9526..d10ad0b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Test-Command: gem2deb-test-runner --autopkgtest 2>&1
-Depends: @, gem2deb-test-runner, ruby-activerecord, ruby-mocha
+Depends: @, gem2deb-test-runner, ruby-activerecord, ruby-mocha, rake
 Restrictions: allow-stderr

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