[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 86d63e6a508b898edec20ad896e7205e25d7b30a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 13:01:51 2012 -0300

    fix tests

diff --git a/debian/changelog b/debian/changelog
index 0c71abd..c917a1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ruby-fast-gettext (0.6.8-1) unstable; urgency=low
     utf8.patch: refreshed
   * debian/ruby-tests.rb: Re-enable tests
   * added build dependency on ruby-i18n, needed to run tests
+  * added debian/patches/fix-tests-with-ruby-calls.patch - do not run ruby
+    under bundler
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 30 Jun 2012 11:42:51 -0300
 
diff --git a/debian/patches/fix-tests-with-ruby-calls.patch b/debian/patches/fix-tests-with-ruby-calls.patch
new file mode 100644
index 0000000..f779347
--- /dev/null
+++ b/debian/patches/fix-tests-with-ruby-calls.patch
@@ -0,0 +1,32 @@
+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
+@@ -2,6 +2,6 @@
+ 
+ describe 'Iconv' do
+   it "also works when Iconv was not found locally" do
+-    system("bundle exec ruby spec/cases/iconv_fallback.rb").should == true
++    system("ruby spec/cases/iconv_fallback.rb").should == true
+   end
+ 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 @@
+   describe 'with i18n loaded' do
+     it "interpolates if i18n is loaded before" 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
+ 
+     it "interpolates if i18n is loaded before" 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
+   end
diff --git a/debian/patches/series b/debian/patches/series
index 6b6f221..5ae74d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix-rspec-requires.patch
 0002-skip-safe-mode-test.patch
 0003-set-default-external-encoding-in-specs-to-utf8.patch
+fix-tests-with-ruby-calls.patch

-- 
ruby-fast-gettext.git