[DRE-commits] [ruby-hashie] 02/05: Refresh local patches

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-hashie.

commit 868bacbb7abfe516b6a53dc26f5909b42373efdc
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Mar 2 17:49:08 2016 +0100

    Refresh local patches
---
 .../0001-spec-spec_helper.rb-don-t-load-pry.patch  | 10 ++--
 debian/patches/fixup-tests.patch                   | 57 +++++++++++++++++-----
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch b/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch
index 3c8f3e8..42f743f 100644
--- a/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch
+++ b/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch
@@ -7,10 +7,10 @@ pry is broken with ruby-slop >= 4.x
  spec/spec_helper.rb | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 7c07c4a..9f061b4 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+Index: ruby-hashie/spec/spec_helper.rb
+===================================================================
+--- ruby-hashie.orig/spec/spec_helper.rb
++++ ruby-hashie/spec/spec_helper.rb
 @@ -3,8 +3,6 @@ if ENV['CI']
    CodeClimate::TestReporter.start
  end
@@ -19,4 +19,4 @@ index 7c07c4a..9f061b4 100644
 -
  require 'rspec'
  require 'hashie'
- 
+ require 'rspec/pending_for'
diff --git a/debian/patches/fixup-tests.patch b/debian/patches/fixup-tests.patch
index 502d033..77467f6 100644
--- a/debian/patches/fixup-tests.patch
+++ b/debian/patches/fixup-tests.patch
@@ -1,20 +1,55 @@
-Description: Don't abort test that breaks on Ruby 2.2 < 2.2.3
-Author: Antonio Terceiro
+Description: Patch out usage of pending_for which we don't have yet
+Author: Antonio Terceiro, Christian Hofstaedtler
 Origin: vendor
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
 Bug-Debian: https://bugs.debian.org/796514
 Forwarded: not-needed
-Last-Update: 2015-12-12
+Last-Update: 2016-03-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/hashie/mash_spec.rb
-+++ b/spec/hashie/mash_spec.rb
-@@ -364,7 +364,7 @@ describe Hashie::Mash do
+Index: ruby-hashie/spec/hashie/mash_spec.rb
+===================================================================
+--- ruby-hashie.orig/spec/hashie/mash_spec.rb
++++ ruby-hashie/spec/hashie/mash_spec.rb
+@@ -363,7 +363,9 @@ describe Hashie::Mash do
  
      it 'is able to access an unknown suffixed key as a method' do
        # See https://github.com/intridea/hashie/pull/285 for more information
--      if mri22?
-+      if mri22? and RUBY_VERSION < '2.2.3'
-         pending 'Bug in MRI 2.2.x means this behavior is broken in those versions'
-       end
+-      pending_for(engine: 'ruby', versions: %w(2.2.0 2.2.1 2.2.2))
++      if RUBY_VERSION < '2.2.3'
++        pending 'Bug in MRI 2.2.x means this behavior is broken in those versions'
++      end
  
+       %w(= ? ! _).each do |suffix|
+         expect(subject.method(:"xyz#{suffix}")).to_not be_nil
+Index: ruby-hashie/spec/spec_helper.rb
+===================================================================
+--- ruby-hashie.orig/spec/spec_helper.rb
++++ ruby-hashie/spec/spec_helper.rb
+@@ -5,7 +5,6 @@ end
+ 
+ require 'rspec'
+ require 'hashie'
+-require 'rspec/pending_for'
+ 
+ RSpec.configure do |config|
+   config.expect_with :rspec do |expect|
+Index: ruby-hashie/spec/hashie/extensions/strict_key_access_spec.rb
+===================================================================
+--- ruby-hashie.orig/spec/hashie/extensions/strict_key_access_spec.rb
++++ ruby-hashie/spec/hashie/extensions/strict_key_access_spec.rb
+@@ -6,7 +6,6 @@ describe Hashie::Extensions::StrictKeyAc
+   end
+ 
+   shared_examples_for 'StrictKeyAccess with valid key' do |options = {}|
+-    before { pending_for(options[:pending]) } if options[:pending]
+     context 'set' do
+       let(:new_value) { 42 }
+       it('returns value') do
+@@ -25,7 +24,6 @@ describe Hashie::Extensions::StrictKeyAc
+     end
+   end
+   shared_examples_for 'StrictKeyAccess with invalid key' do |options = {}|
+-    before { pending_for(options[:pending]) } if options[:pending]
+     context 'access' do
+       it('raises an error') do
+         # Formatting of the error message varies on Rubinius and ruby-head

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