Alias Struct#select as Struct#filter. Patch by Kenichi Kamiya.

[Fix GH-#1862] [#1784]

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

3 files changed, 39 insertions, 22 deletions

diff --git a/spec/ruby/core/struct/filter_spec.rb b/spec/ruby/core/struct/filter_spec.rb
new file mode 100644
index 0000000000..1105ed064a
--- /dev/null
+++ b/spec/ruby/core/struct/filter_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require_relative 'shared/select'
+require_relative 'shared/accessor'
+require_relative '../enumerable/shared/enumeratorized'
+
+ruby_version_is "2.6" do
+  describe "Struct#filter" do
+    it_behaves_like :struct_select, :filter
+    it_behaves_like :struct_accessor, :filter
+    it_behaves_like :enumeratorized_with_origin_size, :filter, Struct.new(:foo).new
+  end
+end
diff --git a/spec/ruby/core/struct/select_spec.rb b/spec/ruby/core/struct/select_spec.rb
index ae78f75a4f..ee846ec45f 100644
--- a/spec/ruby/core/struct/select_spec.rb
+++ b/spec/ruby/core/struct/select_spec.rb
@@ -1,30 +1,10 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+require_relative 'shared/select'
 require_relative 'shared/accessor'
 require_relative '../enumerable/shared/enumeratorized'
 
 describe "Struct#select" do
-  it "raises an ArgumentError if given any non-block arguments" do
-    lambda { StructClasses::Car.new.select(1) { } }.should raise_error(ArgumentError)
-  end
-
-  it "returns a new array of elements for which block is true" do
-    struct = StructClasses::Car.new("Toyota", "Tercel", "2000")
-    struct.select { |i| i == "2000" }.should == [ "2000" ]
-  end
-
-  it "returns an instance of Array" do
-    struct = StructClasses::Car.new("Ford", "Escort", "1995")
-    struct.select { true }.should be_an_instance_of(Array)
-  end
-
-  describe "without block" do
-    it "returns an instance of Enumerator" do
-      struct = Struct.new(:foo).new
-      struct.select.should be_an_instance_of(Enumerator)
-    end
-  end
-
+  it_behaves_like :struct_select, :select
   it_behaves_like :struct_accessor, :select
   it_behaves_like :enumeratorized_with_origin_size, :select, Struct.new(:foo).new
 end
diff --git a/spec/ruby/core/struct/shared/select.rb b/spec/ruby/core/struct/shared/select.rb
new file mode 100644
index 0000000000..a488dfd656
--- /dev/null
+++ b/spec/ruby/core/struct/shared/select.rb
@@ -0,0 +1,25 @@
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
+
+describe :struct_select, shared: true do
+  it "raises an ArgumentError if given any non-block arguments" do
+    lambda { StructClasses::Car.new.send(@method, 1) { } }.should raise_error(ArgumentError)
+  end
+
+  it "returns a new array of elements for which block is true" do
+    struct = StructClasses::Car.new("Toyota", "Tercel", "2000")
+    struct.send(@method) { |i| i == "2000" }.should == [ "2000" ]
+  end
+
+  it "returns an instance of Array" do
+    struct = StructClasses::Car.new("Ford", "Escort", "1995")
+    struct.send(@method) { true }.should be_an_instance_of(Array)
+  end
+
+  describe "without block" do
+    it "returns an instance of Enumerator" do
+      struct = Struct.new(:foo).new
+      struct.send(@method).should be_an_instance_of(Enumerator)
+    end
+  end
+end