[DRE-commits] [ruby-fast-gettext] 05/08: Stop forcing the encoding when running specs

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-fast-gettext.

commit f0b0f97ac5bc882227db1ab11db0c1be7782ed44
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon May 5 18:29:45 2014 +0200

    Stop forcing the encoding when running specs
    
    Let's catch the bugs instead.
---
 ...default-external-encoding-in-specs-to-utf8.patch | 21 ---------------------
 debian/patches/0004-fix-tests-with-ruby-calls.patch | 16 ++++++++--------
 debian/patches/series                               |  1 -
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch b/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
deleted file mode 100644
index 4784672..0000000
--- a/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Sun, 8 Jan 2012 17:44:54 +0300
-Subject: set default external encoding in specs to utf8
-
----
- spec/spec_helper.rb |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-Index: ruby-fast-gettext/spec/spec_helper.rb
-===================================================================
---- ruby-fast-gettext.orig/spec/spec_helper.rb	2012-06-30 11:20:19.000000000 -0300
-+++ ruby-fast-gettext/spec/spec_helper.rb	2012-06-30 11:20:39.673833320 -0300
-@@ -4,6 +4,8 @@
- require 'rspec'
- require 'fast_gettext'
- 
-+Encoding.default_external='UTF-8' if RUBY_VERSION >= '1.9'
-+
- # ---- revert to defaults
- RSpec.configure do |config|
-   config.before do
diff --git a/debian/patches/0004-fix-tests-with-ruby-calls.patch b/debian/patches/0004-fix-tests-with-ruby-calls.patch
index 7f92be9..be430bb 100644
--- a/debian/patches/0004-fix-tests-with-ruby-calls.patch
+++ b/debian/patches/0004-fix-tests-with-ruby-calls.patch
@@ -4,8 +4,8 @@ Subject: fix tests with ruby calls
 
 Index: git/spec/fast_gettext/vendor/iconv_spec.rb
 ===================================================================
---- git.orig/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 18:27:33.364788064 +0200
-+++ git/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 18:28:10.613890459 +0200
+--- git.orig/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 18:28:21.838222621 +0200
++++ git/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 18:30:53.878720808 +0200
 @@ -1,7 +1,9 @@
  require "spec_helper"
  
@@ -19,8 +19,8 @@ Index: git/spec/fast_gettext/vendor/iconv_spec.rb
  end
 Index: git/spec/fast_gettext/vendor/string_spec.rb
 ===================================================================
---- git.orig/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 18:27:33.364788064 +0200
-+++ git/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 18:28:10.613890459 +0200
+--- git.orig/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 18:28:21.838222621 +0200
++++ git/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 18:30:53.878720808 +0200
 @@ -85,16 +85,17 @@
  
    describe 'with i18n loaded' do
@@ -43,13 +43,13 @@ Index: git/spec/fast_gettext/vendor/string_spec.rb
    end
 Index: git/spec/spec_helper.rb
 ===================================================================
---- git.orig/spec/spec_helper.rb	2014-05-05 18:28:07.849808669 +0200
-+++ git/spec/spec_helper.rb	2014-05-05 18:28:10.613890459 +0200
+--- git.orig/spec/spec_helper.rb	2014-05-05 18:30:53.802718559 +0200
++++ git/spec/spec_helper.rb	2014-05-05 18:30:53.882720925 +0200
 @@ -3,6 +3,7 @@
  # ---- requirements
  require 'rspec'
  require 'fast_gettext'
 +require 'rbconfig'
  
- Encoding.default_external='UTF-8' if RUBY_VERSION >= '1.9'
- 
+ # ---- revert to defaults
+ RSpec.configure do |config|
diff --git a/debian/patches/series b/debian/patches/series
index b714ef7..4db322b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-fix-rspec-requires.patch
 0002-skip-safe-mode-test.patch
-0003-set-default-external-encoding-in-specs-to-utf8.patch
 0004-fix-tests-with-ruby-calls.patch

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