[DRE-commits] [ruby-sham-rack] 02/03: [patch] do not load ruby-rr adapters for rspec (Closes #747744)

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-sham-rack.

commit 1b849ded1665709abf945847e46374bd4084c6f9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon May 12 17:04:51 2014 +0200

    [patch] do not load ruby-rr adapters for rspec (Closes #747744)
    
      This avoids having an undefined
      teardown_mocks_for_rspec method.
---
 debian/changelog                      |  9 +++++++++
 debian/patches/drop_rr_adapters.patch | 17 +++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f3ce3f..f88b2a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-sham-rack (1.3.6-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add drop_rr_adapters.patch: do not load RR::Adapters::RSpec2 explicitly in
+    spec/spec_helper.rb. This avoids having an undefined
+    teardown_mocks_for_rspec method. (Closes: #747744)
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 12 May 2014 17:03:05 +0200
+
 ruby-sham-rack (1.3.6-3) unstable; urgency=medium
 
   * Bump build-deps on ruby-rr to >= 1.1.1-2 
diff --git a/debian/patches/drop_rr_adapters.patch b/debian/patches/drop_rr_adapters.patch
new file mode 100644
index 0000000..b5b7255
--- /dev/null
+++ b/debian/patches/drop_rr_adapters.patch
@@ -0,0 +1,17 @@
+Description: drop explicit call to RR::Adapters::RSpec2
+ not needed anymore, according to ruby-rr documentation
+Author: Cédric Boutillier <boutil at debian.org>
+Bug-Debian: https://bugs.debian.org/747744
+Last-Update: 2014-05-12
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,8 +2,5 @@
+ require "rspec"
+ require "rr"
+ 
+-RSpec.configure do |config|
+-  config.mock_with RR::Adapters::RSpec2
+-end
+ 
+ require "test_apps"
diff --git a/debian/patches/series b/debian/patches/series
index ce0f436..4f17ce4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 LICENSE-from-upstream-git.patch
+drop_rr_adapters.patch

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