[GR-14806] Update specs.

PullRequest: truffleruby/869

Author: eregon

spec/mspec/tool/tag_from_output.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 # Adds tags based on error and failures output (e.g., from a CI log),
 # without running any spec code.
 
@@ -8,14 +10,12 @@
 abort 'Could not find tags directory' unless tags_dir
 
 output = ARGF.readlines
-# Remove leading "[exec] " from JRuby logs
-output = output.map { |line| line.sub(/^\[exec\] /, '') }
 
 NUMBER = /^\d+\)$/
 ERROR_OR_FAILED = / (ERROR|FAILED)$/
 SPEC_FILE = /^(\/.+_spec\.rb)\:\d+/
 
-failures = output.slice_before(NUMBER).select { |number, error_line, *rest|
+output.slice_before(NUMBER).select { |number, error_line, *rest|
   number =~ NUMBER and error_line =~ ERROR_OR_FAILED
 }.each { |number, error_line, *rest|
   description = error_line.match(ERROR_OR_FAILED).pre_match
@@ -31,9 +31,8 @@
   Dir.mkdir(dir) unless Dir.exist?(dir)
 
   tag_line = "fails:#{description}"
-  unless File.exist?(tags_file) and File.readlines(tags_file, chomp: true).include?(tag_line)
-    File.open(tags_file, 'a') do |f|
-      f.puts tag_line
-    end
+  lines = File.exist?(tags_file) ? File.readlines(tags_file, chomp: true) : []
+  unless lines.include?(tag_line)
+    File.write(tags_file, (lines + [tag_line]).join("\n") + "\n")
   end
 }

spec/ruby/core/enumerable/filter_map_spec.rb

@@ -0,0 +1,26 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is '2.7' do
+  describe 'Enumerable#filter_map' do
+    before :each do
+      @numerous = EnumerableSpecs::Numerous.new(*(1..8).to_a)
+    end
+
+    it 'returns an empty array if there are no elements' do
+      EnumerableSpecs::Empty.new.filter_map { true }.should == []
+    end
+
+    it 'returns an array with truthy results of passing each element to block' do
+      @numerous.filter_map { |i| i * 2 if i.even? }.should == [4, 8, 12, 16]
+      @numerous.filter_map { |i| i * 2 }.should == [2, 4, 6, 8, 10, 12, 14, 16]
+      @numerous.filter_map { 0 }.should == [0, 0, 0, 0, 0, 0, 0, 0]
+      @numerous.filter_map { false }.should == []
+      @numerous.filter_map { nil }.should == []
+    end
+
+    it 'returns an enumerator when no block given' do
+      @numerous.filter_map.should be_an_instance_of(Enumerator)
+    end
+  end
+end

spec/ruby/core/enumerable/shared/find.rb

@@ -49,6 +49,10 @@
     @empty.send(@method, fail_proc) {|e| true}.should == "yay"
   end
 
+  it "ignores the ifnone argument when nil" do
+    @numerous.send(@method, nil) {|e| false }.should == nil
+  end
+
   it "passes through the values yielded by #each_with_index" do
     [:a, :b].each_with_index.send(@method) { |x, i| ScratchPad << [x, i]; nil }
     ScratchPad.recorded.should == [[:a, 0], [:b, 1]]

spec/ruby/core/exception/backtrace_spec.rb

@@ -65,4 +65,19 @@
       e.backtrace[0].should == "backtrace first"
     end
   end
+
+  it "returns the same array after duping" do
+    begin
+      raise
+    rescue RuntimeError => err
+      bt = err.backtrace
+      err.dup.backtrace.should equal(bt)
+
+      new_bt = ['hi']
+      err.set_backtrace new_bt
+
+      err.backtrace.should == new_bt
+      err.dup.backtrace.should equal(new_bt)
+    end
+  end
 end

spec/ruby/core/exception/frozen_error_spec.rb

@@ -0,0 +1,34 @@
+require_relative '../../spec_helper'
+
+describe "FrozenError" do
+  ruby_version_is "2.5" do
+    it "is a subclass of RuntimeError" do
+      RuntimeError.should be_ancestor_of(FrozenError)
+    end
+  end
+end
+
+describe "FrozenError.new" do
+  ruby_version_is "2.7" do
+    it "should take optional receiver argument" do
+      o = Object.new
+      FrozenError.new("msg", o).receiver.should equal(o)
+    end
+  end
+end
+
+describe "FrozenError#receiver" do
+  ruby_version_is "2.7" do
+    it "should return frozen object that modification was attempted on" do
+      o = Object.new.freeze
+      begin
+        def o.x; end
+      rescue => e
+        e.should be_kind_of(FrozenError)
+        e.receiver.should equal(o)
+      else
+        raise
+      end
+    end
+  end
+end

spec/ruby/core/file/expand_path_spec.rb

@@ -225,6 +225,8 @@
       user = ENV.delete("USER")
       begin
         Etc.getlogin != nil
+      rescue
+        false
       ensure
         ENV["USER"] = user
       end

spec/ruby/core/hash/constructor_spec.rb

@@ -42,13 +42,26 @@
     Hash[ary].should == { a: :b }
   end
 
-  it "ignores elements that are not arrays" do
-    -> {
-      Hash[[:a]].should == {}
-    }.should complain(/ignoring wrong elements/)
-    -> {
-      Hash[[:nil]].should == {}
-    }.should complain(/ignoring wrong elements/)
+  ruby_version_is "" ... "2.7" do
+    it "ignores elements that are not arrays" do
+      -> {
+        Hash[[:a]].should == {}
+      }.should complain(/ignoring wrong elements/)
+      -> {
+        Hash[[:nil]].should == {}
+      }.should complain(/ignoring wrong elements/)
+    end
+  end
+
+  ruby_version_is "2.7" do
+    it "raises for elements that are not arrays" do
+      -> {
+        Hash[[:a]].should == {}
+      }.should raise_error(ArgumentError)
+      -> {
+        Hash[[:nil]].should == {}
+      }.should raise_error(ArgumentError)
+    end
   end
 
   it "raises an ArgumentError for arrays of more than 2 elements" do

spec/ruby/core/marshal/dump_spec.rb

@@ -449,14 +449,13 @@ def obj.foo; end
         zone = ":\tzoneI\"\bAST\x06:\x06EF" # Last is 'F' (US-ASCII)
         [ "#{base}#{offset}#{zone}", "#{base}#{zone}#{offset}" ].should include(dump)
       end
-
-      it "dumps the zone, but not the offset if zone is UTC" do
-        dump = Marshal.dump(@utc)
-        zone = ":\tzoneI\"\bUTC\x06:\x06EF" # Last is 'F' (US-ASCII)
-        dump.should == "\x04\bIu:\tTime\r#{@utc_dump}\x06#{zone}"
-      end
     end
 
+    it "dumps the zone, but not the offset if zone is UTC" do
+      dump = Marshal.dump(@utc)
+      zone = ":\tzoneI\"\bUTC\x06:\x06EF" # Last is 'F' (US-ASCII)
+      dump.should == "\x04\bIu:\tTime\r#{@utc_dump}\x06#{zone}"
+    end
   end
 
   describe "with an Exception" do

spec/ruby/core/module/autoload_spec.rb

@@ -449,6 +449,9 @@ module ModuleSpecs::Autoload::Q
   it "does not load the file when accessing the constants table of the module" do
     ModuleSpecs::Autoload.autoload :P, @non_existent
     ModuleSpecs::Autoload.const_defined?(:P).should be_true
+    ruby_bug "[Bug #15780]", ""..."2.7" do
+      ModuleSpecs::Autoload.const_defined?("P").should be_true
+    end
   end
 
   it "loads the file when opening a module that is the autoloaded constant" do

spec/ruby/core/module/name_spec.rb

@@ -15,7 +15,34 @@
   it "is not nil for a nested module created with the module keyword" do
     m = Module.new
     module m::N; end
-    m::N.name.should =~ /#<Module:0x[0-9a-f]+>::N/
+    m::N.name.should =~ /\A#<Module:0x[0-9a-f]+>::N\z/
+  end
+
+  it "changes when the module is reachable through a constant path" do
+    m = Module.new
+    module m::N; end
+    m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
+    ModuleSpecs::Anonymous::WasAnnon = m::N
+    m::N.name.should == "ModuleSpecs::Anonymous::WasAnnon"
+  end
+
+  it "is set after it is removed from a constant" do
+    module ModuleSpecs
+      module ModuleToRemove
+      end
+
+      mod = ModuleToRemove
+      remove_const(:ModuleToRemove)
+      mod.name.should == "ModuleSpecs::ModuleToRemove"
+    end
+  end
+
+  it "is set after it is removed from a constant under an anonymous module" do
+    m = Module.new
+    module m::Child; end
+    child = m::Child
+    m.send(:remove_const, :Child)
+    child.name.should =~ /\A#<Module:0x\h+>::Child\z/
   end
 
   it "is set when opened with the module keyword" do
@@ -40,6 +67,15 @@ module m::N; end
     m.name.should == "ModuleSpecs::Anonymous::B"
   end
 
+  it "is not modified when assigned to a different anonymous module" do
+    m = Module.new
+    module m::M; end
+    first_name = m::M.name.dup
+    module m::N; end
+    m::N::F = m::M
+    m::M.name.should == first_name
+  end
+
   # http://bugs.ruby-lang.org/issues/6067
   it "is set with a conditional assignment to a nested constant" do
     eval("ModuleSpecs::Anonymous::F ||= Module.new")