[DRE-commits] [ruby-actionpack-action-caching] 03/06: Add debian/patches/Fix-Failing-Tests.patch, from upstream

[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 c9e0b6154ca5722f8b0c9015635a361ef5531d60
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 09:00:33 2015 -0200

    Add debian/patches/Fix-Failing-Tests.patch, from upstream
---
 debian/changelog                       |  1 +
 debian/patches/Fix-Failing-Tests.patch | 22 ++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba59f62..6b5dd2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-actionpack-action-caching (1.1.1-4) UNRELEASED; urgency=medium
   * Drop debian/patches/dont-use-bundler-in-tests.patch
     - added bundler to Build-Depends:
   * debian/copyright: fill in Source: URL
+  * Add debian/patches/Fix-Failing-Tests.patch, from upstream
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 14 Dec 2015 08:52:22 -0200
 
diff --git a/debian/patches/Fix-Failing-Tests.patch b/debian/patches/Fix-Failing-Tests.patch
new file mode 100644
index 0000000..bd1d15f
--- /dev/null
+++ b/debian/patches/Fix-Failing-Tests.patch
@@ -0,0 +1,22 @@
+From b604120c789f7b9e50075ff29e569c3451a50f87 Mon Sep 17 00:00:00 2001
+From: claudiob <claudiob at gmail.com>
+Date: Tue, 6 Jan 2015 08:47:14 -0800
+Subject: [PATCH] Fix failing tests by requiring mocha
+
+Now that the rails gem points to 4.2, we need to require mocha in order
+to use the `expects` syntax, otherwise tests will fail. See:
+https://travis-ci.org/rails/actionpack-action_caching/jobs/46021642
+---
+ test/caching_test.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/caching_test.rb b/test/caching_test.rb
+index 71d74fd..53f99ab 100644
+--- a/test/caching_test.rb
++++ b/test/caching_test.rb
+@@ -1,4 +1,5 @@
+ require 'abstract_unit'
++require 'mocha/setup'
+ 
+ CACHE_DIR = 'test_cache'
+ # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fed429b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Fix-Failing-Tests.patch

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