[DRE-commits] [SCM] ruby-fast-gettext.git branch, master, updated. upstream/0.6.8-32-g622055d

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 622055d804351ded0ceaf43234a6c3b1bc0c5bdf
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 13:28:02 2012 -0300

    fix tests - again

diff --git a/debian/patches/fix-tests-with-ruby-calls.patch b/debian/patches/fix-tests-with-ruby-calls.patch
index f779347..49d4535 100644
--- a/debian/patches/fix-tests-with-ruby-calls.patch
+++ b/debian/patches/fix-tests-with-ruby-calls.patch
@@ -1,7 +1,7 @@
 Index: ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb
 ===================================================================
---- ruby-fast-gettext.orig/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 12:57:49.546862115 -0300
-+++ ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 12:58:16.483035115 -0300
+--- ruby-fast-gettext.orig/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 12:58:24.119084699 -0300
++++ ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 13:24:18.210727451 -0300
 @@ -2,6 +2,6 @@
  
  describe 'Iconv' do
@@ -12,21 +12,23 @@ Index: ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb
  end
 Index: ruby-fast-gettext/spec/fast_gettext/vendor/string_spec.rb
 ===================================================================
---- ruby-fast-gettext.orig/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 12:57:49.546862115 -0300
-+++ ruby-fast-gettext/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 12:58:16.483035115 -0300
-@@ -96,13 +96,13 @@
+--- ruby-fast-gettext.orig/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 12:58:24.119084699 -0300
++++ ruby-fast-gettext/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 13:27:24.532249520 -0300
+@@ -95,15 +95,11 @@
+ 
    describe 'with i18n loaded' do
      it "interpolates if i18n is loaded before" do
-       pending_18 do
+-      pending_18 do
 -        system("bundle exec ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
-+        system("ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
-       end
+-      end
++      system("ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
      end
  
      it "interpolates if i18n is loaded before" do
-       pending_18 do
+-      pending_18 do
 -        system("bundle exec ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
-+        system("ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
-       end
+-      end
++      system("ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
      end
    end
+ end

-- 
ruby-fast-gettext.git