From 4fbb9aa3cb6c31ec128bfb31f59efa66d66adba4 Mon Sep 17 00:00:00 2001
From: eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 28 Apr 2018 19:50:06 +0000
Subject: Update to ruby/spec@6f38a82

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/ruby/core/array/shared/delete_if.rb | 24 +++++-------------------
 spec/ruby/core/array/shared/inspect.rb   | 21 ++++-----------------
 2 files changed, 9 insertions(+), 36 deletions(-)

(limited to 'spec/ruby/core/array/shared')

diff --git a/spec/ruby/core/array/shared/delete_if.rb b/spec/ruby/core/array/shared/delete_if.rb
index a9fb57e0d9..a3fdcf4fac 100644
--- a/spec/ruby/core/array/shared/delete_if.rb
+++ b/spec/ruby/core/array/shared/delete_if.rb
@@ -3,25 +3,11 @@ describe :delete_if, shared: true do
     @object = [1,2,3]
   end
 
-  ruby_version_is "2.3" do
-    it "updates the receiver after all blocks" do
-      @object.send(@method) do |e|
-        @object.length.should == 3
-        true
-      end
-      @object.length.should == 0
-    end
-  end
-
-  ruby_version_is ""..."2.3" do
-    it "updates the receiver after each true block" do
-      count = 0
-      @object.send(@method) do |e|
-        @object.length.should == (3 - count)
-        count += 1
-        true
-      end
-      @object.length.should == 0
+  it "updates the receiver after all blocks" do
+    @object.send(@method) do |e|
+      @object.length.should == 3
+      true
     end
+    @object.length.should == 0
   end
 end
diff --git a/spec/ruby/core/array/shared/inspect.rb b/spec/ruby/core/array/shared/inspect.rb
index 0cf5035b37..1bcc9f9ca8 100644
--- a/spec/ruby/core/array/shared/inspect.rb
+++ b/spec/ruby/core/array/shared/inspect.rb
@@ -121,24 +121,11 @@ describe :array_inspect, shared: true do
       array.send(@method).encoding.name.should == "US-ASCII"
     end
 
-    ruby_version_is ''...'2.3' do
-      it "raises if inspected result is not default external encoding" do
-        utf_16be = mock("utf_16be")
-        utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
-
-        lambda {
-          [utf_16be].send(@method)
-        }.should raise_error(Encoding::CompatibilityError)
-      end
-    end
-
-    ruby_version_is '2.3' do
-      it "does not raise if inspected result is not default external encoding" do
-        utf_16be = mock("utf_16be")
-        utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
+    it "does not raise if inspected result is not default external encoding" do
+      utf_16be = mock("utf_16be")
+      utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
 
-        [utf_16be].send(@method).should == '["utf_16be \u3042"]'
-      end
+      [utf_16be].send(@method).should == '["utf_16be \u3042"]'
     end
   end
 end
-- 
cgit v1.2.3