diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-09 11:07:01 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-01 15:36:20 +0900 |
commit | 3a2073e61b6ccce6d07d31ebd89d4c385b9a55f2 (patch) | |
tree | b4697ea23f16f340589d27b4f4c046233b2bd106 /spec/ruby/optional | |
parent | 151f8be40d385ada2ebf7feb84210ed7db7ef4df (diff) | |
download | ruby-3a2073e61b6ccce6d07d31ebd89d4c385b9a55f2.tar.gz |
Use FrozenError instead of frozen_error_class
Diffstat (limited to 'spec/ruby/optional')
-rw-r--r-- | spec/ruby/optional/capi/array_spec.rb | 12 | ||||
-rw-r--r-- | spec/ruby/optional/capi/module_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/optional/capi/object_spec.rb | 12 | ||||
-rw-r--r-- | spec/ruby/optional/capi/struct_spec.rb | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/spec/ruby/optional/capi/array_spec.rb b/spec/ruby/optional/capi/array_spec.rb index 6bb20e5921..1a26c6c585 100644 --- a/spec/ruby/optional/capi/array_spec.rb +++ b/spec/ruby/optional/capi/array_spec.rb @@ -83,8 +83,8 @@ describe "C-API Array function" do @s.rb_ary_cat([1, 2], 3, 4).should == [1, 2, 3, 4] end - it "raises a #{frozen_error_class} if the array is frozen" do - -> { @s.rb_ary_cat([].freeze, 1) }.should raise_error(frozen_error_class) + it "raises a FrozenError if the array is frozen" do + -> { @s.rb_ary_cat([].freeze, 1) }.should raise_error(FrozenError) end end @@ -130,8 +130,8 @@ describe "C-API Array function" do @s.rb_ary_rotate([1, 2, 3, 4], -3).should == [2, 3, 4, 1] end - it "raises a #{frozen_error_class} if the array is frozen" do - -> { @s.rb_ary_rotate([].freeze, 1) }.should raise_error(frozen_error_class) + it "raises a FrozenError if the array is frozen" do + -> { @s.rb_ary_rotate([].freeze, 1) }.should raise_error(FrozenError) end end @@ -214,9 +214,9 @@ describe "C-API Array function" do a.should == [nil, nil, 7] end - it "raises a #{frozen_error_class} if the array is frozen" do + it "raises a FrozenError if the array is frozen" do a = [1, 2, 3].freeze - -> { @s.rb_ary_store(a, 1, 5) }.should raise_error(frozen_error_class) + -> { @s.rb_ary_store(a, 1, 5) }.should raise_error(FrozenError) end end diff --git a/spec/ruby/optional/capi/module_spec.rb b/spec/ruby/optional/capi/module_spec.rb index bf09e9d8a5..f5ce7ed8de 100644 --- a/spec/ruby/optional/capi/module_spec.rb +++ b/spec/ruby/optional/capi/module_spec.rb @@ -336,12 +336,12 @@ describe "CApiModule" do @frozen = @class.dup.freeze end - it "raises a #{frozen_error_class} when passed a name" do - -> { @m.rb_undef_method @frozen, "ruby_test_method" }.should raise_error(frozen_error_class) + it "raises a FrozenError when passed a name" do + -> { @m.rb_undef_method @frozen, "ruby_test_method" }.should raise_error(FrozenError) end - it "raises a #{frozen_error_class} when passed a missing name" do - -> { @m.rb_undef_method @frozen, "not_exist" }.should raise_error(frozen_error_class) + it "raises a FrozenError when passed a missing name" do + -> { @m.rb_undef_method @frozen, "not_exist" }.should raise_error(FrozenError) end end end diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb index e5f9c83a79..8b9e8bbc25 100644 --- a/spec/ruby/optional/capi/object_spec.rb +++ b/spec/ruby/optional/capi/object_spec.rb @@ -318,8 +318,8 @@ describe "CApiObject" do it "does not rescue exceptions raised by #to_ary" do obj = mock("to_ary") - obj.should_receive(:to_ary).and_raise(frozen_error_class) - -> { @o.rb_check_array_type obj }.should raise_error(frozen_error_class) + obj.should_receive(:to_ary).and_raise(FrozenError) + -> { @o.rb_check_array_type obj }.should raise_error(FrozenError) end end @@ -680,15 +680,15 @@ describe "CApiObject" do obj.tainted?.should == true end - it "raises a #{frozen_error_class} if the object passed is frozen" do - -> { @o.rb_obj_taint("".freeze) }.should raise_error(frozen_error_class) + it "raises a FrozenError if the object passed is frozen" do + -> { @o.rb_obj_taint("".freeze) }.should raise_error(FrozenError) end end end describe "rb_check_frozen" do - it "raises a #{frozen_error_class} if the obj is frozen" do - -> { @o.rb_check_frozen("".freeze) }.should raise_error(frozen_error_class) + it "raises a FrozenError if the obj is frozen" do + -> { @o.rb_check_frozen("".freeze) }.should raise_error(FrozenError) end it "does nothing when object isn't frozen" do diff --git a/spec/ruby/optional/capi/struct_spec.rb b/spec/ruby/optional/capi/struct_spec.rb index 6254b098a9..c071203673 100644 --- a/spec/ruby/optional/capi/struct_spec.rb +++ b/spec/ruby/optional/capi/struct_spec.rb @@ -188,9 +188,9 @@ describe "C-API Struct function" do -> { @s.rb_struct_aset(@struct, 3, 1) }.should raise_error(IndexError) end - it "raises a #{frozen_error_class} if the struct is frozen" do + it "raises a FrozenError if the struct is frozen" do @struct.freeze - -> { @s.rb_struct_aset(@struct, :a, 1) }.should raise_error(frozen_error_class) + -> { @s.rb_struct_aset(@struct, :a, 1) }.should raise_error(FrozenError) end end |