1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Antonio Terceiro <terceiro@debian.org>
Date: Sat, 2 Feb 2019 13:57:17 -0200
Subject: fix tests with ruby calls
---
spec/fast_gettext/vendor/iconv_spec.rb | 4 +++-
spec/fast_gettext/vendor/string_spec.rb | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/spec/fast_gettext/vendor/iconv_spec.rb b/spec/fast_gettext/vendor/iconv_spec.rb
index 4d6b8f6..ed793d1 100644
--- a/spec/fast_gettext/vendor/iconv_spec.rb
+++ b/spec/fast_gettext/vendor/iconv_spec.rb
@@ -1,7 +1,9 @@
require "spec_helper"
describe 'Iconv' do
+ let(:ruby) { File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) }
+
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
diff --git a/spec/fast_gettext/vendor/string_spec.rb b/spec/fast_gettext/vendor/string_spec.rb
index 1c55ef6..3969528 100644
--- a/spec/fast_gettext/vendor/string_spec.rb
+++ b/spec/fast_gettext/vendor/string_spec.rb
@@ -85,16 +85,17 @@ describe String do
describe 'with i18n loaded' do
let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or (ActiveRecord::VERSION::MAJOR == 4 and ActiveRecord::VERSION::MINOR == 0)}
+ let(:ruby) { File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) }
it "interpolates if i18n is loaded before" do
pending_if pending_condition, "does not work on ree + rails 3 or rails 4" 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_if pending_condition, "does not work on ree + rails 3 or rails 4" 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
|
