Update to ruby/spec@ab32a1a

Author: eregon

spec/ruby/.rubocop.yml

@@ -99,6 +99,9 @@ Lint/DuplicateElsifCondition:
 Lint/OutOfRangeRegexpRef:
   Enabled: false
 
+Lint/InheritException:
+  Enabled: false
+
 Lint/ElseLayout:
   Exclude:
     - 'language/if_spec.rb'

spec/ruby/.rubocop_todo.yml

@@ -50,17 +50,6 @@ Lint/IneffectiveAccessModifier:
     - 'core/module/fixtures/classes.rb'
     - 'language/fixtures/private.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: runtime_error, standard_error
-Lint/InheritException:
-  Exclude:
-    - 'core/enumerator/lazy/fixtures/classes.rb'
-    - 'core/exception/fixtures/common.rb'
-    - 'core/module/fixtures/autoload_ex1.rb'
-    - 'shared/kernel/raise.rb'
-
 # Offense count: 72
 # Cop supports --auto-correct.
 Lint/LiteralInInterpolation:

spec/ruby/core/env/shared/update.rb

@@ -15,6 +15,15 @@
     ENV["bar"].should == "1"
   end
 
+  ruby_version_is "3.2" do
+    it "adds the multiple parameter hashes to ENV, returning ENV" do
+      ENV.send(@method, {"foo" => "0", "bar" => "1"}, {"baz" => "2"}).should equal(ENV)
+      ENV["foo"].should == "0"
+      ENV["bar"].should == "1"
+      ENV["baz"].should == "2"
+    end
+  end
+
   it "returns ENV when no block given" do
     ENV.send(@method, {"foo" => "0", "bar" => "1"}).should equal(ENV)
   end

spec/ruby/core/float/round_spec.rb

@@ -136,7 +136,7 @@
     -4.809999999999999.round(5, half: :even).should eql(-4.81)
   end
 
-  ruby_bug "", ""..."3.2" do
+  ruby_bug "", ""..."3.3" do
     # These numbers are neighbouring floating point numbers round a
     # precise value. They test that the rounding modes work correctly
     # round that value and precision is not lost which might cause

spec/ruby/core/io/shared/readlines.rb

@@ -79,7 +79,7 @@
         (result ? result : ScratchPad.recorded).should == IOSpecs.lines
       end
 
-      ruby_bug "#18767", ""..."3.2" do
+      ruby_bug "#18767", ""..."3.3" do
         describe "when passed limit" do
           it "raises ArgumentError when passed 0 as a limit" do
             -> { IO.send(@method, @name, 0, &@object) }.should raise_error(ArgumentError)
@@ -256,4 +256,4 @@
       end
     end
   end
-end
+end

spec/ruby/core/math/ldexp_spec.rb

@@ -45,6 +45,12 @@
   it "accepts any second argument that can be coerced with Integer()" do
     Math.ldexp(3.23, MathSpecs::Integer.new).should be_close(12.92, TOLERANCE)
   end
+
+  it "returns correct value that closes to the max value of double type" do
+    Math.ldexp(0.5122058490966879, 1024).should == 9.207889385574391e+307
+    Math.ldexp(0.9999999999999999, 1024).should == 1.7976931348623157e+308
+    Math.ldexp(0.99999999999999999, 1024).should == Float::INFINITY
+  end
 end
 
 describe "Math#ldexp" do

spec/ruby/core/module/autoload_spec.rb

@@ -577,6 +577,36 @@ class LexicalScope
       end
     end
 
+    ruby_version_is "3.2" do
+      it "warns once in verbose mode if the constant was defined in a parent scope" do
+        ScratchPad.record -> {
+          ModuleSpecs::DeclaredInCurrentDefinedInParent = :declared_in_current_defined_in_parent
+        }
+
+        module ModuleSpecs
+          module Autoload
+            autoload :DeclaredInCurrentDefinedInParent, fixture(__FILE__, "autoload_callback.rb")
+            self.autoload?(:DeclaredInCurrentDefinedInParent).should == fixture(__FILE__, "autoload_callback.rb")
+            const_defined?(:DeclaredInCurrentDefinedInParent).should == true
+
+            -> {
+              DeclaredInCurrentDefinedInParent
+            }.should complain(
+              /Expected .*autoload_callback.rb to define ModuleSpecs::Autoload::DeclaredInCurrentDefinedInParent but it didn't/,
+              verbose: true,
+            )
+
+            -> {
+              DeclaredInCurrentDefinedInParent
+            }.should_not complain(/.*/, verbose: true)
+            self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
+            const_defined?(:DeclaredInCurrentDefinedInParent).should == false
+            ModuleSpecs.const_defined?(:DeclaredInCurrentDefinedInParent).should == true
+          end
+        end
+      end
+    end
+
     ruby_version_is "3.1" do
       it "looks up in parent scope after failed autoload" do
         @remove << :DeclaredInCurrentDefinedInParent

spec/ruby/core/regexp/shared/new.rb

@@ -58,6 +58,15 @@ class RegexpSpecsSubclassTwo < Regexp; end
     end
   end
 
+  it "sets options from second argument if it is true" do
+    r = Regexp.send(@method, 'Hi', true)
+    (r.options & Regexp::IGNORECASE).should_not == 0
+    (r.options & Regexp::MULTILINE).should == 0
+    not_supported_on :opal do
+      (r.options & Regexp::EXTENDED).should == 0
+    end
+  end
+
   it "sets options from second argument if it is one of the Integer option constants" do
     r = Regexp.send(@method, 'Hi', Regexp::IGNORECASE)
     (r.options & Regexp::IGNORECASE).should_not == 0
@@ -88,12 +97,67 @@ class RegexpSpecsSubclassTwo < Regexp; end
     (r.options & Regexp::EXTENDED).should_not == 0
   end
 
-  it "treats any non-Integer, non-nil, non-false second argument as IGNORECASE" do
-    r = Regexp.send(@method, 'Hi', Object.new)
-    (r.options & Regexp::IGNORECASE).should_not == 0
-    (r.options & Regexp::MULTILINE).should == 0
-    not_supported_on :opal do
-      (r.options & Regexp::EXTENDED).should == 0
+  ruby_version_is ""..."3.2" do
+    it "treats any non-Integer, non-nil, non-false second argument as IGNORECASE" do
+      r = Regexp.send(@method, 'Hi', Object.new)
+      (r.options & Regexp::IGNORECASE).should_not == 0
+      (r.options & Regexp::MULTILINE).should == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should == 0
+      end
+    end
+  end
+
+  ruby_version_is "3.2" do
+    it "warns any non-Integer, non-nil, non-false second argument" do
+      r = nil
+      -> {
+        r = Regexp.send(@method, 'Hi', Object.new)
+      }.should complain(/expected true or false as ignorecase/, {verbose: true})
+      (r.options & Regexp::IGNORECASE).should_not == 0
+      (r.options & Regexp::MULTILINE).should == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should == 0
+      end
+    end
+
+    it "accepts a String of supported flags as the second argument" do
+      r = Regexp.send(@method, 'Hi', 'i')
+      (r.options & Regexp::IGNORECASE).should_not == 0
+      (r.options & Regexp::MULTILINE).should == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should == 0
+      end
+
+      r = Regexp.send(@method, 'Hi', 'imx')
+      (r.options & Regexp::IGNORECASE).should_not == 0
+      (r.options & Regexp::MULTILINE).should_not == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should_not == 0
+      end
+
+      r = Regexp.send(@method, 'Hi', 'mimi')
+      (r.options & Regexp::IGNORECASE).should_not == 0
+      (r.options & Regexp::MULTILINE).should_not == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should == 0
+      end
+
+      r = Regexp.send(@method, 'Hi', '')
+      (r.options & Regexp::IGNORECASE).should == 0
+      (r.options & Regexp::MULTILINE).should == 0
+      not_supported_on :opal do
+        (r.options & Regexp::EXTENDED).should == 0
+      end
+    end
+
+    it "raises an Argument error if the second argument contains unsupported chars" do
+      -> { Regexp.send(@method, 'Hi', 'e') }.should raise_error(ArgumentError)
+      -> { Regexp.send(@method, 'Hi', 'n') }.should raise_error(ArgumentError)
+      -> { Regexp.send(@method, 'Hi', 's') }.should raise_error(ArgumentError)
+      -> { Regexp.send(@method, 'Hi', 'u') }.should raise_error(ArgumentError)
+      -> { Regexp.send(@method, 'Hi', 'j') }.should raise_error(ArgumentError)
+      -> { Regexp.send(@method, 'Hi', 'mjx') }.should raise_error(ArgumentError)
     end
   end
 

spec/ruby/core/string/dedup_spec.rb

@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require_relative 'shared/dedup'
+
+describe 'String#dedup' do
+  ruby_version_is '3.2'do
+    it_behaves_like :string_dedup, :dedup
+  end
+end

spec/ruby/core/string/shared/dedup.rb

@@ -0,0 +1,47 @@
+describe :string_dedup, shared: true do
+  it 'returns self if the String is frozen' do
+    input  = 'foo'.freeze
+    output = input.send(@method)
+
+    output.should equal(input)
+    output.should.frozen?
+  end
+
+  it 'returns a frozen copy if the String is not frozen' do
+    input  = 'foo'
+    output = input.send(@method)
+
+    output.should.frozen?
+    output.should_not equal(input)
+    output.should == 'foo'
+  end
+
+  it "returns the same object for equal unfrozen strings" do
+    origin = "this is a string"
+    dynamic = %w(this is a string).join(' ')
+
+    origin.should_not equal(dynamic)
+    origin.send(@method).should equal(dynamic.send(@method))
+  end
+
+  it "returns the same object when it's called on the same String literal" do
+    "unfrozen string".send(@method).should equal("unfrozen string".send(@method))
+    "unfrozen string".send(@method).should_not equal("another unfrozen string".send(@method))
+  end
+
+  it "deduplicates frozen strings" do
+    dynamic = %w(this string is frozen).join(' ').freeze
+
+    dynamic.should_not equal("this string is frozen".freeze)
+
+    dynamic.send(@method).should equal("this string is frozen".freeze)
+    dynamic.send(@method).should equal("this string is frozen".send(@method).freeze)
+  end
+
+  ruby_version_is "3.0" do
+    it "interns the provided string if it is frozen" do
+      dynamic = "this string is unique and frozen #{rand}".freeze
+      dynamic.send(@method).should equal(dynamic)
+    end
+  end
+end