6 files changed, 31 insertions, 16 deletions
diff --git a/spec/ruby/.rubocop.yml b/spec/ruby/.rubocop.yml
index d90310b077..58529f15b2 100644
--- a/spec/ruby/.rubocop.yml
+++ b/spec/ruby/.rubocop.yml
@@ -5,8 +5,6 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - command_line/fixtures/bad_syntax.rb
-    - language/fixtures/utf16-le-bom.rb
-    - language/fixtures/utf16-be-bom.rb
   DisabledByDefault: true
 
 Layout/TrailingWhitespace:
diff --git a/spec/ruby/command_line/dash_encoding_spec.rb b/spec/ruby/command_line/dash_encoding_spec.rb
index e7889b4def..36ce55af5f 100644
--- a/spec/ruby/command_line/dash_encoding_spec.rb
+++ b/spec/ruby/command_line/dash_encoding_spec.rb
@@ -1,33 +1,30 @@
 require_relative '../spec_helper'
 
-describe 'The --encoding command line option' do
+describe "The --encoding command line option" do
   before :each do
     @test_string = "print [Encoding.default_external.name, Encoding.default_internal&.name].inspect"
+    @enc2 = Encoding::ISO_8859_1
   end
 
-  describe 'sets Encoding.default_external and optionally Encoding.default_internal' do
+  describe "sets Encoding.default_external and optionally Encoding.default_internal" do
     it "if given a single encoding with an =" do
-      ruby_exe(@test_string, options: '--disable-gems --encoding=big5').should == [Encoding::Big5.name, nil].inspect
+      ruby_exe(@test_string, options: "--disable-gems --encoding=big5").should == [Encoding::Big5.name, nil].inspect
     end
 
     it "if given a single encoding as a separate argument" do
-      ruby_exe(@test_string, options: '--disable-gems --encoding big5').should == [Encoding::Big5.name, nil].inspect
+      ruby_exe(@test_string, options: "--disable-gems --encoding big5").should == [Encoding::Big5.name, nil].inspect
     end
 
     it "if given two encodings with an =" do
-      ruby_exe(@test_string, options: '--disable-gems --encoding=big5:utf-32be').should == [Encoding::Big5.name, Encoding::UTF_32BE.name].inspect
+      ruby_exe(@test_string, options: "--disable-gems --encoding=big5:#{@enc2}").should == [Encoding::Big5.name, @enc2.name].inspect
     end
 
     it "if given two encodings as a separate argument" do
-      ruby_exe(@test_string, options: '--disable-gems --encoding big5:utf-32be').should == [Encoding::Big5.name, Encoding::UTF_32BE.name].inspect
-    end
-
-    it "if given two encodings as a separate argument" do
-      ruby_exe(@test_string, options: '--disable-gems --encoding big5:utf-32be').should == [Encoding::Big5.name, Encoding::UTF_32BE.name].inspect
+      ruby_exe(@test_string, options: "--disable-gems --encoding big5:#{@enc2}").should == [Encoding::Big5.name, @enc2.name].inspect
     end
   end
 
   it "does not accept a third encoding" do
-    ruby_exe(@test_string, options: '--disable-gems --encoding big5:utf-32be:utf-32le', args: '2>&1').should =~ /extra argument for --encoding: utf-32le/
+    ruby_exe(@test_string, options: "--disable-gems --encoding big5:#{@enc2}:utf-32le", args: "2>&1").should =~ /extra argument for --encoding: utf-32le/
   end
 end
diff --git a/spec/ruby/language/fixtures/utf16-be-bom.rb b/spec/ruby/language/fixtures/utf16-be-bom.rb
deleted file mode 100644
index 8cb31e42f0..0000000000
--- a/spec/ruby/language/fixtures/utf16-be-bom.rb
+++ /dev/null
diff --git a/spec/ruby/language/fixtures/utf16-le-bom.rb b/spec/ruby/language/fixtures/utf16-le-bom.rb
deleted file mode 100644
index 935a9041fa..0000000000
--- a/spec/ruby/language/fixtures/utf16-le-bom.rb
+++ /dev/null
diff --git a/spec/ruby/language/predefined/data_spec.rb b/spec/ruby/language/predefined/data_spec.rb
index 7bbccdaca1..921d236ee9 100644
--- a/spec/ruby/language/predefined/data_spec.rb
+++ b/spec/ruby/language/predefined/data_spec.rb
@@ -34,7 +34,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.binread(fixture(__FILE__, "empty_data.rb"))
-    touch(path) { |f| f.write code.chomp }
+    touch(path, "wb") { |f| f.write code.chomp }
     begin
       ruby_exe(path).should == "30\n\"\"\n"
     ensure
diff --git a/spec/ruby/language/source_encoding_spec.rb b/spec/ruby/language/source_encoding_spec.rb
index d4240cee39..a0a29f63de 100644
--- a/spec/ruby/language/source_encoding_spec.rb
+++ b/spec/ruby/language/source_encoding_spec.rb
@@ -22,7 +22,17 @@ describe "Source files" do
 
   describe "encoded in UTF-16 LE with a BOM" do
     it "are invalid because they contain an invalid UTF-8 sequence before the encoding comment" do
-      ruby_exe(fixture(__FILE__, "utf16-le-bom.rb"), args: "2>&1").should =~ /invalid multibyte char/
+      bom = "\xFF\xFE".b
+      source = "# encoding: utf-16le\nputs 'hello'\n"
+      source = bom + source.bytes.zip([0]*source.bytesize).flatten.pack('C*')
+      path = tmp("utf16-le-bom.rb")
+
+      touch(path, "wb") { |f| f.write source }
+      begin
+        ruby_exe(path, args: "2>&1").should =~ /invalid multibyte char/
+      ensure
+        rm_r path
+      end
     end
   end
 
@@ -34,7 +44,17 @@ describe "Source files" do
 
   describe "encoded in UTF-16 BE with a BOM" do
     it "are invalid because they contain an invalid UTF-8 sequence before the encoding comment" do
-      ruby_exe(fixture(__FILE__, "utf16-be-bom.rb"), args: "2>&1").should =~ /invalid multibyte char/
+      bom = "\xFE\xFF".b
+      source = "# encoding: utf-16be\nputs 'hello'\n"
+      source = bom + ([0]*source.bytesize).zip(source.bytes).flatten.pack('C*')
+      path = tmp("utf16-be-bom.rb")
+
+      touch(path, "wb") { |f| f.write source }
+      begin
+        ruby_exe(path, args: "2>&1").should =~ /invalid multibyte char/
+      ensure
+        rm_r path
+      end
     end
   end