[DRE-commits] [ruby-carrierwave] 04/08: refresh patches

[Praveen Arimbrathodiyil]

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

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

commit 9ab753fb87e14a5f6762b52e12012f7d6e76a92f
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jul 24 17:26:54 2017 +0530

    refresh patches
---
 debian/patches/add-available-locales.patch   |  2 +-
 debian/patches/fix-download-test.patch       | 14 +++++++-------
 debian/patches/remove-rubygems-require.patch | 11 +++--------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/patches/add-available-locales.patch b/debian/patches/add-available-locales.patch
index 1831f12..57b04f7 100644
--- a/debian/patches/add-available-locales.patch
+++ b/debian/patches/add-available-locales.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-02-02
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -41,6 +41,7 @@
+@@ -29,6 +29,7 @@
  
  CarrierWave.root = public_path
  I18n.load_path << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "carrierwave", "locale", 'en.yml'))
diff --git a/debian/patches/fix-download-test.patch b/debian/patches/fix-download-test.patch
index 557b733..d7db881 100644
--- a/debian/patches/fix-download-test.patch
+++ b/debian/patches/fix-download-test.patch
@@ -10,12 +10,12 @@ Subject: [PATCH] fix broken spec: fixed message of CarrierWave::DownloadError
 
 --- a/spec/uploader/download_spec.rb
 +++ b/spec/uploader/download_spec.rb
-@@ -117,7 +117,7 @@
-     it 'should not obscure original exception message' do
-       expect {
-         @uploader.download!('http://www.example.com/missing.jpg')
--      }.to raise_error(CarrierWave::DownloadError, /could not download file: 404/)
-+      }.to raise_error(CarrierWave::DownloadError, 'could not download file: 404 Not Found')
+@@ -133,7 +133,7 @@
      end
  
-     describe '#download! with an extension_white_list' do
+     it "doesn't obscure original exception message" do
+-      expect { uploader.download!("#{base_url}/missing.jpg") }.to raise_error(CarrierWave::DownloadError, /could not download file: 404/)
++      expect { uploader.download!("#{base_url}/missing.jpg") }.to raise_error(CarrierWave::DownloadError, 'could not download file: 404')
+     end
+ 
+     describe '#download! with an extension_whitelist' do
diff --git a/debian/patches/remove-rubygems-require.patch b/debian/patches/remove-rubygems-require.patch
index 0e162b8..5d50792 100644
--- a/debian/patches/remove-rubygems-require.patch
+++ b/debian/patches/remove-rubygems-require.patch
@@ -5,15 +5,10 @@ Last-Update: 2013-05-01
 
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,7 +1,9 @@
- # encoding: utf-8
- 
+@@ -1,6 +1,3 @@
 -require 'rubygems'
 -require 'bundler/setup'
-+# We'll add dependencies in debian/control
-+# so rubygems and bundler not required
-+# require 'rubygems'
-+# require 'bundler/setup'
- 
+-
+ require 'pry'
  require 'tempfile'
  require 'time'

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