Update to ruby/spec@6f38a82

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 50 insertions, 52 deletions

diff --git a/spec/ruby/core/thread/name_spec.rb b/spec/ruby/core/thread/name_spec.rb
index 503a909158..adb2d08fae 100644
--- a/spec/ruby/core/thread/name_spec.rb
+++ b/spec/ruby/core/thread/name_spec.rb
@@ -1,56 +1,54 @@
 require_relative '../../spec_helper'
 
-ruby_version_is '2.3' do
-  describe "Thread#name" do
-    before :each do
-      @thread = Thread.new {}
-    end
-
-    after :each do
-      @thread.join
-    end
-
-    it "is nil initially" do
-      @thread.name.should == nil
-    end
-
-    it "returns the thread name" do
-      @thread.name = "thread_name"
-      @thread.name.should == "thread_name"
-    end
-  end
-
-  describe "Thread#name=" do
-    before :each do
-      @thread = Thread.new {}
-    end
-
-    after :each do
-      @thread.join
-    end
-
-    it "can be set to a String" do
-      @thread.name = "new thread name"
-      @thread.name.should == "new thread name"
-    end
-
-    it "raises an ArgumentError if the name includes a null byte" do
-      lambda {
-        @thread.name = "new thread\0name"
-      }.should raise_error(ArgumentError)
-    end
-
-    it "can be reset to nil" do
-      @thread.name = nil
-      @thread.name.should == nil
-    end
-
-    it "calls #to_str to convert name to String" do
-      name = mock("Thread#name")
-      name.should_receive(:to_str).and_return("a thread name")
-
-      @thread.name = name
-      @thread.name.should == "a thread name"
-    end
+describe "Thread#name" do
+  before :each do
+    @thread = Thread.new {}
+  end
+
+  after :each do
+    @thread.join
+  end
+
+  it "is nil initially" do
+    @thread.name.should == nil
+  end
+
+  it "returns the thread name" do
+    @thread.name = "thread_name"
+    @thread.name.should == "thread_name"
+  end
+end
+
+describe "Thread#name=" do
+  before :each do
+    @thread = Thread.new {}
+  end
+
+  after :each do
+    @thread.join
+  end
+
+  it "can be set to a String" do
+    @thread.name = "new thread name"
+    @thread.name.should == "new thread name"
+  end
+
+  it "raises an ArgumentError if the name includes a null byte" do
+    lambda {
+      @thread.name = "new thread\0name"
+    }.should raise_error(ArgumentError)
+  end
+
+  it "can be reset to nil" do
+    @thread.name = nil
+    @thread.name.should == nil
+  end
+
+  it "calls #to_str to convert name to String" do
+    name = mock("Thread#name")
+    name.should_receive(:to_str).and_return("a thread name")
+
+    @thread.name = name
+    @thread.name.should == "a thread name"
   end
 end