1 files changed, 21 insertions, 4 deletions
diff --git a/spec/ruby/library/matrix/map_spec.rb b/spec/ruby/library/matrix/map_spec.rb
index cde0df5441..bae96db381 100644
--- a/spec/ruby/library/matrix/map_spec.rb
+++ b/spec/ruby/library/matrix/map_spec.rb
@@ -1,9 +1,26 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is ""..."3.1" do
-  require_relative 'shared/collect'
+describe "Matrix#map" do
+  before :all do
+    @m = Matrix[ [1, 2], [1, 2] ]
+  end
+
+  it "returns an instance of Matrix" do
+    @m.map{|n| n * 2 }.should.is_a?(Matrix)
+  end
+
+  it "returns a Matrix where each element is the result of the block" do
+    @m.map { |n| n * 2 }.should == Matrix[ [2, 4], [2, 4] ]
+  end
+
+  it "returns an enumerator if no block is given" do
+    @m.map.should.instance_of?(Enumerator)
+  end
 
-  describe "Matrix#map" do
-    it_behaves_like :collect, :map
+  describe "for a subclass of Matrix" do
+    it "returns an instance of that subclass" do
+      MatrixSub.ins.map{1}.should.instance_of?(MatrixSub)
+    end
   end
 end