[DRE-commits] [ruby-rspec] 06/15: update last patch

[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-rspec.

commit e264996815211998bd5bca8c37e33d66e6cdbf7e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jun 13 23:50:02 2015 +0200

    update last patch
---
 .../disable_no_warning_spec_rspec-support.patch    | 24 +++++++++++++---------
 debian/patches/series                              |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/patches/disable_no_warning_spec_rspec-support.patch b/debian/patches/disable_no_warning_spec_rspec-support.patch
index 27e9e66..db14eb6 100644
--- a/debian/patches/disable_no_warning_spec_rspec-support.patch
+++ b/debian/patches/disable_no_warning_spec_rspec-support.patch
@@ -4,22 +4,26 @@ Description: disable spec testing if warnings are issued when loading rspec-supp
  Disable, waiting for a better solution.
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-04-01
+Last-Update: 2015-06-13
 
 --- a/rspec-support/spec/rspec/support_spec.rb
 +++ b/rspec-support/spec/rspec/support_spec.rb
-@@ -5,10 +5,10 @@
+@@ -5,12 +5,12 @@
    describe Support do
      extend Support::RubyFeatures
  
--    it_behaves_like "a library that issues no warnings when loaded", "rspec-support",
--      # Define methods that some of our rspec/support/spec files use at load time.
--      "module RSpec; def self.configure; end; def self.shared_context(*); end; def self.shared_examples_for(*); end; end",
--      'require "rspec/support"'
-+    #it_behaves_like "a library that issues no warnings when loaded", "rspec-support",
-+    #  # Define methods that some of our rspec/support/spec files use at load time.
-+    #  "module RSpec; def self.configure; end; def self.shared_context(*); end; def self.shared_examples_for(*); end; end",
-+    #  'require "rspec/support"'
+-    it_behaves_like "library wide checks", "rspec-support",
+-      :consider_a_test_env_file => %r{rspec/support/spec},
+-      :allowed_loaded_feature_regexps => [
+-        /rbconfig/, # Used by RubyFeatures
+-        /prettyprint.rb/, /pp.rb/, /diff\/lcs/ # These are all loaded by the differ.
+-      ]
++    #it_behaves_like "library wide checks", "rspec-support",
++    #  :consider_a_test_env_file => %r{rspec/support/spec},
++    #  :allowed_loaded_feature_regexps => [
++    #    /rbconfig/, # Used by RubyFeatures
++    #    /prettyprint.rb/, /pp.rb/, /diff\/lcs/ # These are all loaded by the differ.
++    #  ]
  
      describe '.method_handle_for(object, method_name)' do
        untampered_class = Class.new do
diff --git a/debian/patches/series b/debian/patches/series
index a081319..49b406e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,6 @@ escape-path-in-match.patch
 caller_filter_spec_for_debian.patch
 fix_encoding.patch
 #no-aruba.patch
-#disable_no_warning_spec_rspec-support.patch
+disable_no_warning_spec_rspec-support.patch
 fix-rake-task.patch
 autorun-load-configuration.patch

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