[DRE-commits] [ruby-grape] 03/04: Assume ruby-rack-contrib is available

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-grape.

commit a8903dff0e9766b8c1247b9d9b7c2bc98bc02865
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jul 15 14:46:20 2015 -0300

    Assume ruby-rack-contrib is available
---
 debian/control                                     |  1 +
 ...ending-until-ruby-rack-contrib-is-package.patch | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 8319472..0931f3f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                ruby-multi-xml (>= 0.5.2),
                ruby-rack (>= 1.3.0),
                ruby-rack-accept,
+               ruby-rack-contrib,
                ruby-rack-mount,
                ruby-rack-test,
                ruby-rspec,
diff --git a/debian/patches/0003-Mark-test-pending-until-ruby-rack-contrib-is-package.patch b/debian/patches/0003-Mark-test-pending-until-ruby-rack-contrib-is-package.patch
deleted file mode 100644
index b00d9c3..0000000
--- a/debian/patches/0003-Mark-test-pending-until-ruby-rack-contrib-is-package.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Tue, 7 Jul 2015 15:14:04 +0300
-Subject: Mark test pending until ruby-rack-contrib is packaged
-
----
- spec/grape/entity_spec.rb | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/spec/grape/entity_spec.rb b/spec/grape/entity_spec.rb
-index 2677dd4..41a079a 100644
---- a/spec/grape/entity_spec.rb
-+++ b/spec/grape/entity_spec.rb
-@@ -264,7 +264,11 @@ XML
-     end
- 
-     it 'presents with jsonp utilising Rack::JSONP' do
--      require 'rack/contrib'
-+      begin
-+        require 'rack/contrib'
-+      rescue LoadError
-+        pending "ruby-rack-contrib is not packaged yet"
-+      end
- 
-       # Include JSONP middleware
-       subject.use Rack::JSONP
diff --git a/debian/patches/series b/debian/patches/series
index 0cd7d79..e2f7a30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Do-not-require-bundler-nor-rubygems.patch
 0002-Allow-release-absence-in-Rack.release.patch
-0003-Mark-test-pending-until-ruby-rack-contrib-is-package.patch

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