[DRE-commits] [ruby-hashie] 03/05: remove patch fixup-tests.patch and disable rails tests

[Praveen Arimbrathodiyil]

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

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

commit d23b3111b4d048e5ff2b4cb25facaccb7215e80d
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jul 3 17:48:27 2017 +0530

    remove patch fixup-tests.patch and disable rails tests
---
 debian/control                                     |  5 +-
 .../0001-spec-spec_helper.rb-don-t-load-pry.patch  | 10 ++--
 debian/patches/fixup-tests.patch                   | 55 ----------------------
 debian/patches/series                              |  1 -
 debian/ruby-tests.rake                             |  2 +-
 5 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/debian/control b/debian/control
index 8461d83..27d11cb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,9 @@ Build-Depends: debhelper (>= 9~),
                pry,
                rake,
                ruby-activesupport,
-               ruby-rspec
-Standards-Version: 3.9.7
+               ruby-rspec,
+               ruby-rspec-pending-for
+Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-hashie.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-hashie.git
 Homepage: https://github.com/intridea/hashie
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 42f743f..24876cf 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,12 +7,10 @@ pry is broken with ruby-slop >= 4.x
  spec/spec_helper.rb | 2 --
  1 file changed, 2 deletions(-)
 
-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
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -3,8 +3,6 @@
+   SimpleCov.start
  end
  
 -require 'pry'
diff --git a/debian/patches/fixup-tests.patch b/debian/patches/fixup-tests.patch
deleted file mode 100644
index 77467f6..0000000
--- a/debian/patches/fixup-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Patch out usage of pending_for which we don't have yet
-Author: Antonio Terceiro, Christian Hofstaedtler
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/796514
-Forwarded: not-needed
-Last-Update: 2016-03-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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
--      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
diff --git a/debian/patches/series b/debian/patches/series
index e15b691..9eb5093 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-spec-spec_helper.rb-don-t-load-pry.patch
-fixup-tests.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index cf1591e..a4add22 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,5 @@
 require 'gem2deb/rake/spectask'
 
 Gem2Deb::Rake::RSpecTask.new do |spec|
-  spec.pattern = './spec/**/*_spec.rb'
+  spec.pattern = FileList['./spec/**/*_spec.rb'] - FileList['./spec/integration/rails/integration_spec.rb','./spec/integration/omniauth-oauth2/integration_spec.rb']
 end

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