summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-27 16:22:21 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-27 16:22:21 +0000
commit2dca35b9b125f0ce5cfc74f5871b26913364cc7f (patch)
tree461f9e2de7d0a47070f515cc1029a1279aade214
parent58689fa7474a8151630eae463b8053e7b24d158d (diff)
Update to ruby/spec@007e908
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--spec/ruby/command_line/dash_upper_k_spec.rb9
-rw-r--r--spec/ruby/language/fixtures/utf16-le-bom.rbbin71 -> 70 bytes
-rw-r--r--spec/ruby/language/magic_comment_spec.rb34
-rw-r--r--spec/ruby/language/predefined/data_spec.rb2
4 files changed, 24 insertions, 21 deletions
diff --git a/spec/ruby/command_line/dash_upper_k_spec.rb b/spec/ruby/command_line/dash_upper_k_spec.rb
index d7e16d6..ef1248b 100644
--- a/spec/ruby/command_line/dash_upper_k_spec.rb
+++ b/spec/ruby/command_line/dash_upper_k_spec.rb
@@ -57,10 +57,9 @@ describe 'The -K command line option' do
end
end
- platform_is_not :windows do
- it "ignores unknown codes" do
- ruby_exe(@test_string, options: '-KZ').should ==
- [Encoding::UTF_8.name, Encoding::UTF_8.name, nil].inspect
- end
+ it "ignores unknown codes" do
+ locale = Encoding.find('locale')
+ ruby_exe(@test_string, options: '-KZ').should ==
+ [Encoding::UTF_8.name, locale.name, nil].inspect
end
end
diff --git a/spec/ruby/language/fixtures/utf16-le-bom.rb b/spec/ruby/language/fixtures/utf16-le-bom.rb
index 935a904..981016e 100644
--- a/spec/ruby/language/fixtures/utf16-le-bom.rb
+++ b/spec/ruby/language/fixtures/utf16-le-bom.rb
Binary files differ
diff --git a/spec/ruby/language/magic_comment_spec.rb b/spec/ruby/language/magic_comment_spec.rb
index c3abf3c..f2bf3a0 100644
--- a/spec/ruby/language/magic_comment_spec.rb
+++ b/spec/ruby/language/magic_comment_spec.rb
@@ -2,8 +2,12 @@ require_relative '../spec_helper'
# See core/kernel/eval_spec.rb for more magic comments specs for eval()
describe :magic_comments, shared: true do
+ before :each do
+ @default = @method == :locale ? Encoding.find('locale') : Encoding::UTF_8
+ end
+
it "are optional" do
- @object.call('no_magic_comment.rb').should == Encoding::UTF_8.name
+ @object.call('no_magic_comment.rb').should == @default.name
end
it "are case-insensitive" do
@@ -11,11 +15,11 @@ describe :magic_comments, shared: true do
end
it "must be at the first line" do
- @object.call('second_line_magic_comment.rb').should == Encoding::UTF_8.name
+ @object.call('second_line_magic_comment.rb').should == @default.name
end
it "must be the first token of the line" do
- @object.call('second_token_magic_comment.rb').should == Encoding::UTF_8.name
+ @object.call('second_token_magic_comment.rb').should == @default.name
end
it "can be after the shebang" do
@@ -40,16 +44,16 @@ describe :magic_comments, shared: true do
end
describe "Magic comments" do
- platform_is_not :windows do
- describe "in stdin" do
- it_behaves_like :magic_comments, nil, -> file {
- print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
- ruby_exe(nil, args: "< #{fixture(__FILE__, file)}", options: "-r#{print_at_exit}")
- }
- end
+ describe "in stdin" do
+ it_behaves_like :magic_comments, :locale, -> file {
+ print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
+ ruby_exe(nil, args: "< #{fixture(__FILE__, file)}", options: "-r#{print_at_exit}")
+ }
+ end
+ platform_is_not :windows do
describe "in an -e argument" do
- it_behaves_like :magic_comments, nil, -> file {
+ it_behaves_like :magic_comments, :locale, -> file {
print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
# Use UTF-8, as it is the default source encoding for files
code = File.read(fixture(__FILE__, file), encoding: 'utf-8')
@@ -59,28 +63,28 @@ describe "Magic comments" do
end
describe "in the main file" do
- it_behaves_like :magic_comments, nil, -> file {
+ it_behaves_like :magic_comments, :UTF8, -> file {
print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
ruby_exe(fixture(__FILE__, file), options: "-r#{print_at_exit}")
}
end
describe "in a loaded file" do
- it_behaves_like :magic_comments, nil, -> file {
+ it_behaves_like :magic_comments, :UTF8, -> file {
load fixture(__FILE__, file)
$magic_comment_result
}
end
describe "in a required file" do
- it_behaves_like :magic_comments, nil, -> file {
+ it_behaves_like :magic_comments, :UTF8, -> file {
require fixture(__FILE__, file)
$magic_comment_result
}
end
describe "in an eval" do
- it_behaves_like :magic_comments, nil, -> file {
+ it_behaves_like :magic_comments, :UTF8, -> file {
# Use UTF-8, as it is the default source encoding for files
eval(File.read(fixture(__FILE__, file), encoding: 'utf-8'))
}
diff --git a/spec/ruby/language/predefined/data_spec.rb b/spec/ruby/language/predefined/data_spec.rb
index 6a070c5..7bbccda 100644
--- a/spec/ruby/language/predefined/data_spec.rb
+++ b/spec/ruby/language/predefined/data_spec.rb
@@ -33,7 +33,7 @@ describe "The DATA constant" do
it "is set even if there is no newline after __END__" do
path = tmp("no_newline_data.rb")
- code = File.read(fixture(__FILE__, "empty_data.rb"))
+ code = File.binread(fixture(__FILE__, "empty_data.rb"))
touch(path) { |f| f.write code.chomp }
begin
ruby_exe(path).should == "30\n\"\"\n"