[DRE-commits] [ruby-actionpack-page-caching] 01/01: fix running tests against Rails 4.2

[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-page-caching.

commit db739e7ca93f3710256450909326e93718a29f1f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 09:24:23 2015 -0200

    fix running tests against Rails 4.2
---
 debian/changelog                       |  8 ++++++++
 debian/patches/Fix-Failing-Tests.patch | 22 ++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 81720ae..777379b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-actionpack-page-caching (1.0.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add debian/patches/Fix-Failing-Tests.patch from upstream to fix running
+    tests against Rails 4.2
+
+ -- Antonio Terceiro <terceiro at debian.org>  Mon, 14 Dec 2015 09:24:26 -0200
+
 ruby-actionpack-page-caching (1.0.2-3) unstable; urgency=medium
 
   * Fix long description (Closes: #781801) 
diff --git a/debian/patches/Fix-Failing-Tests.patch b/debian/patches/Fix-Failing-Tests.patch
new file mode 100644
index 0000000..c730953
--- /dev/null
+++ b/debian/patches/Fix-Failing-Tests.patch
@@ -0,0 +1,22 @@
+From 160aabc7f6138e6bef4779f9b555174fea5a487b Mon Sep 17 00:00:00 2001
+From: claudiob <claudiob at gmail.com>
+Date: Tue, 6 Jan 2015 08:40:03 -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 a25845a..7b20895 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
index 1d5f1b8..a828d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Bundler-Dependency
+Fix-Failing-Tests.patch

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