summaryrefslogtreecommitdiff
path: root/spec/ruby/language
diff options
context:
space:
mode:
authorBenoit Daloze <eregontp@gmail.com>2020-09-15 21:54:31 +0200
committerBenoit Daloze <eregontp@gmail.com>2020-09-15 21:56:00 +0200
commit1af0319fc88688bc5dd5e49eecdb8b534ead9991 (patch)
tree352b35490e64bc961dc005d679392106d6be90b9 /spec/ruby/language
parent9b535f3ff7c2f48e34dd44564df7adc723b81276 (diff)
2.8 -> 3.0 in specs
Diffstat (limited to 'spec/ruby/language')
-rw-r--r--spec/ruby/language/block_spec.rb20
-rw-r--r--spec/ruby/language/class_spec.rb4
-rw-r--r--spec/ruby/language/constants_spec.rb2
-rw-r--r--spec/ruby/language/lambda_spec.rb8
-rw-r--r--spec/ruby/language/method_spec.rb20
-rw-r--r--spec/ruby/language/numbered_parameters_spec.rb4
-rw-r--r--spec/ruby/language/regexp_spec.rb2
-rw-r--r--spec/ruby/language/send_spec.rb4
8 files changed, 32 insertions, 32 deletions
diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb
index 8a02f61925..45a8ec5f9a 100644
--- a/spec/ruby/language/block_spec.rb
+++ b/spec/ruby/language/block_spec.rb
@@ -44,7 +44,7 @@ describe "A block yielded a single" do
m([1, 2]) { |a, **k| [a, k] }.should == [1, {}]
end
- ruby_version_is ''..."2.8" do
+ ruby_version_is ''..."3.0" do
it "assigns elements to mixed argument types" do
suppress_keyword_warning do
result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] }
@@ -70,7 +70,7 @@ describe "A block yielded a single" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "assigns elements to mixed argument types" do
result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] }
result.should == [1, 2, [3], {x: 9}, 2, {}]
@@ -102,7 +102,7 @@ describe "A block yielded a single" do
end
end
- ruby_version_is "2.7"...'2.8' do
+ ruby_version_is "2.7"...'3.0' do
it "calls #to_hash on the argument but ignores result when optional argument and keyword argument accepted" do
obj = mock("coerce block keyword arguments")
obj.should_receive(:to_hash).and_return({"a" => 1, "b" => 2})
@@ -112,7 +112,7 @@ describe "A block yielded a single" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "does not call #to_hash on the argument when optional argument and keyword argument accepted and does not autosplat" do
obj = mock("coerce block keyword arguments")
obj.should_not_receive(:to_hash)
@@ -123,7 +123,7 @@ describe "A block yielded a single" do
end
describe "when non-symbol keys are in a keyword arguments Hash" do
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
it "separates non-symbol keys and symbol keys" do
suppress_keyword_warning do
result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] }
@@ -131,7 +131,7 @@ describe "A block yielded a single" do
end
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "does not separate non-symbol keys and symbol keys and does not autosplat" do
suppress_keyword_warning do
result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] }
@@ -141,21 +141,21 @@ describe "A block yielded a single" do
end
end
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
it "does not treat hashes with string keys as keyword arguments" do
result = m(["a" => 10]) { |a = nil, **b| [a, b] }
result.should == [{"a" => 10}, {}]
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "does not treat hashes with string keys as keyword arguments and does not autosplat" do
result = m(["a" => 10]) { |a = nil, **b| [a, b] }
result.should == [[{"a" => 10}], {}]
end
end
- ruby_version_is ''...'2.8' do
+ ruby_version_is ''...'3.0' do
it "calls #to_hash on the last element if keyword arguments are present" do
suppress_keyword_warning do
obj = mock("destructure block keyword arguments")
@@ -202,7 +202,7 @@ describe "A block yielded a single" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
it "does not call #to_hash on the last element if keyword arguments are present" do
obj = mock("destructure block keyword arguments")
obj.should_not_receive(:to_hash)
diff --git a/spec/ruby/language/class_spec.rb b/spec/ruby/language/class_spec.rb
index 2b9a4afef7..4ff6e65181 100644
--- a/spec/ruby/language/class_spec.rb
+++ b/spec/ruby/language/class_spec.rb
@@ -285,7 +285,7 @@ describe "A class definition extending an object (sclass)" do
}.should raise_error(TypeError)
end
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
it "allows accessing the block of the original scope" do
suppress_warning do
ClassSpecs.sclass_with_block { 123 }.should == 123
@@ -293,7 +293,7 @@ describe "A class definition extending an object (sclass)" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "does not allow accessing the block of the original scope" do
-> {
ClassSpecs.sclass_with_block { 123 }
diff --git a/spec/ruby/language/constants_spec.rb b/spec/ruby/language/constants_spec.rb
index 47897234b9..4d46cf2f84 100644
--- a/spec/ruby/language/constants_spec.rb
+++ b/spec/ruby/language/constants_spec.rb
@@ -154,7 +154,7 @@ describe "Literal (A::X) constant resolution" do
-> { ConstantSpecs::ParentA::CS_CONSTX }.should raise_error(NameError)
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "uses the module or class #name to craft the error message" do
mod = Module.new do
def self.name
diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb
index 3f2cb0310c..1c9acba39c 100644
--- a/spec/ruby/language/lambda_spec.rb
+++ b/spec/ruby/language/lambda_spec.rb
@@ -179,7 +179,7 @@ describe "A lambda literal -> () { }" do
result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12]
end
- ruby_version_is ''...'2.8' do
+ ruby_version_is ''...'3.0' do
evaluate <<-ruby do
@a = -> (*, **k) { k }
ruby
@@ -195,7 +195,7 @@ describe "A lambda literal -> () { }" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
evaluate <<-ruby do
@a = -> (*, **k) { k }
ruby
@@ -546,7 +546,7 @@ describe "A lambda expression 'lambda { ... }'" do
result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12]
end
- ruby_version_is ''...'2.8' do
+ ruby_version_is ''...'3.0' do
evaluate <<-ruby do
@a = lambda { |*, **k| k }
ruby
@@ -562,7 +562,7 @@ describe "A lambda expression 'lambda { ... }'" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
evaluate <<-ruby do
@a = lambda { |*, **k| k }
ruby
diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb
index e31f3032b0..dd4ea51572 100644
--- a/spec/ruby/language/method_spec.rb
+++ b/spec/ruby/language/method_spec.rb
@@ -733,7 +733,7 @@ describe "A method" do
end
end
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
evaluate <<-ruby do
def m(a, b: 1) [a, b] end
ruby
@@ -768,7 +768,7 @@ describe "A method" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
evaluate <<-ruby do
def m(a, b: 1) [a, b] end
ruby
@@ -905,7 +905,7 @@ describe "A method" do
result.should == [[1, 2, 3], 4, [5, 6], 7, [], 8]
end
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
evaluate <<-ruby do
def m(a=1, b:) [a, b] end
ruby
@@ -930,7 +930,7 @@ describe "A method" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
evaluate <<-ruby do
def m(a=1, b:) [a, b] end
ruby
@@ -1167,7 +1167,7 @@ describe "A method" do
end
end
- ruby_version_is "2.7"...'2.8' do
+ ruby_version_is "2.7"...'3.0' do
evaluate <<-ruby do
def m(*, a:) a end
ruby
@@ -1626,7 +1626,7 @@ describe "A method" do
result.should == [1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l]
end
- ruby_version_is ''...'2.8' do
+ ruby_version_is ''...'3.0' do
evaluate <<-ruby do
def m(a, b = nil, c = nil, d, e: nil, **f)
[a, b, c, d, e, f]
@@ -1646,7 +1646,7 @@ describe "A method" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
evaluate <<-ruby do
def m(a, b = nil, c = nil, d, e: nil, **f)
[a, b, c, d, e, f]
@@ -1665,7 +1665,7 @@ describe "A method" do
end
end
- ruby_version_is ''...'2.8' do
+ ruby_version_is ''...'3.0' do
context "assigns keyword arguments from a passed Hash without modifying it" do
evaluate <<-ruby do
def m(a: nil); a; end
@@ -1682,7 +1682,7 @@ describe "A method" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
context "raises ArgumentError if passing hash as keyword arguments" do
evaluate <<-ruby do
def m(a: nil); a; end
@@ -1787,7 +1787,7 @@ describe "An array-dereference method ([])" do
end
end
-ruby_version_is '2.8' do
+ruby_version_is '3.0' do
describe "An endless method definition" do
evaluate <<-ruby do
def m(a) = a
diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb
index 9dd79f44b8..b05c373a68 100644
--- a/spec/ruby/language/numbered_parameters_spec.rb
+++ b/spec/ruby/language/numbered_parameters_spec.rb
@@ -32,7 +32,7 @@ ruby_version_is "2.7" do
}.should raise_error(SyntaxError, /numbered parameter is already used in.+ outer block here/m)
end
- ruby_version_is '2.7'...'2.8' do
+ ruby_version_is '2.7'...'3.0' do
it "can be overwritten with local variable" do
suppress_warning do
eval <<~CODE
@@ -49,7 +49,7 @@ ruby_version_is "2.7" do
end
end
- ruby_version_is '2.8' do
+ ruby_version_is '3.0' do
it "cannot be overwritten with local variable" do
-> {
eval <<~CODE
diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb
index 059428ec69..def9bba5f7 100644
--- a/spec/ruby/language/regexp_spec.rb
+++ b/spec/ruby/language/regexp_spec.rb
@@ -18,7 +18,7 @@ describe "Literal Regexps" do
/Hello/.should be_kind_of(Regexp)
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "is frozen" do
/Hello/.should.frozen?
end
diff --git a/spec/ruby/language/send_spec.rb b/spec/ruby/language/send_spec.rb
index 17381166dc..e57e2c65dc 100644
--- a/spec/ruby/language/send_spec.rb
+++ b/spec/ruby/language/send_spec.rb
@@ -421,7 +421,7 @@ describe "Invoking a method" do
specs.rest_len(0,*a,4,*5,6,7,*c,-1).should == 11
end
- ruby_version_is ""..."2.8" do
+ ruby_version_is ""..."3.0" do
it "expands the Array elements from the splat after executing the arguments and block if no other arguments follow the splat" do
def self.m(*args, &block)
[args, block]
@@ -437,7 +437,7 @@ describe "Invoking a method" do
end
end
- ruby_version_is "2.8" do
+ ruby_version_is "3.0" do
it "expands the Array elements from the splat before applying block argument operations" do
def self.m(*args, &block)
[args, block]