Improve spec descriptions for write transcoding

Author: eregon

spec/ruby/core/io/shared/write.rb

@@ -107,20 +107,18 @@
     rm_r @transcode_filename
   end
 
-  describe "transcoding when UTF-16 encoding is set" do
-    it "accepts a UTF-8-encoded string and transcodes it" do
-      utf8_str = "hello"
+  it "transcodes the given string when the external encoding is set and neither is BINARY" do
+    utf8_str = "hello"
 
-      File.open(@transcode_filename, "w", external_encoding: Encoding::UTF_16BE) do |file|
-        file.external_encoding.should == Encoding::UTF_16BE
-        file.send(@method, utf8_str)
-      end
+    File.open(@transcode_filename, "w", external_encoding: Encoding::UTF_16BE) do |file|
+      file.external_encoding.should == Encoding::UTF_16BE
+      file.send(@method, utf8_str)
+    end
 
-      result = File.binread(@transcode_filename)
-      expected = [0, 104, 0, 101, 0, 108, 0, 108, 0, 111] # double-width "hello"
+    result = File.binread(@transcode_filename)
+    expected = [0, 104, 0, 101, 0, 108, 0, 108, 0, 111] # UTF-16BE bytes for "hello"
 
-      result.bytes.should == expected
-    end
+    result.bytes.should == expected
   end
 end
 
@@ -133,19 +131,17 @@
     rm_r @transcode_filename
   end
 
-  describe "transcoding when UTF-16 encoding is set" do
-    it "accepts a UTF-8-encoded string and transcodes it" do
-      utf8_str = "hello"
+  it "does not transcode the given string even when the external encoding is set" do
+    utf8_str = "hello"
 
-      File.open(@transcode_filename, "w", external_encoding: Encoding::UTF_16BE) do |file|
-        file.external_encoding.should == Encoding::UTF_16BE
-        file.send(@method, utf8_str)
-      end
+    File.open(@transcode_filename, "w", external_encoding: Encoding::UTF_16BE) do |file|
+      file.external_encoding.should == Encoding::UTF_16BE
+      file.send(@method, utf8_str)
+    end
 
-      result = File.binread(@transcode_filename)
-      expected = [104, 101, 108, 108, 111] # not transcoded to UTF-16BE
+    result = File.binread(@transcode_filename)
+    expected = [104, 101, 108, 108, 111] # UTF-8 bytes for "hello", not transcoded to UTF-16BE
 
-      result.bytes.should == expected
-    end
+    result.bytes.should == expected
   end
 end

spec/ruby/library/stringio/shared/write.rb

@@ -89,23 +89,17 @@
     @io.string.should == "12fghi"
   end
 
-  describe "transcoding" do
-    describe "when UTF-16 encoding is set" do
-      it "accepts a UTF-8-encoded string and transcodes it" do
-        io = StringIO.new.set_encoding(Encoding::UTF_16BE)
-        utf8_str = "hello"
-
-        io.send(@method, utf8_str)
-
-        result = io.string
-        expected = [
-          0, 104, 0, 101, 0, 108, 0, 108, 0, 111, # double-width "hello"
-        ]
-
-        io.external_encoding.should == Encoding::UTF_16BE
-        result.bytes.should == expected
-      end
-    end
+  it "transcodes the given string when the external encoding is set and neither is BINARY" do
+    io = StringIO.new.set_encoding(Encoding::UTF_16BE)
+    utf8_str = "hello"
+
+    io.send(@method, utf8_str)
+
+    result = io.string
+    expected = [0, 104, 0, 101, 0, 108, 0, 108, 0, 111] # UTF-16BE bytes for "hello"
+
+    io.external_encoding.should == Encoding::UTF_16BE
+    result.bytes.should == expected
   end
 end