diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-27 16:12:47 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-27 16:12:47 +0000 |
commit | a34db218ade33b79e7404488db5a15bad2841c25 (patch) | |
tree | 2ed22ad149cd75e36d9aabbe29b32e96c27fa3a6 /spec/ruby/core/kernel | |
parent | 0f989b87a06563add3fdeb9cda983492e8a420af (diff) | |
download | ruby-a34db218ade33b79e7404488db5a15bad2841c25.tar.gz |
Update to ruby/spec@0fe33ac
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/core/kernel')
-rw-r--r-- | spec/ruby/core/kernel/extend_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/kernel/instance_variable_set_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/core/kernel/taint_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/kernel/trust_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/kernel/untaint_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/kernel/untrust_spec.rb | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/spec/ruby/core/kernel/extend_spec.rb b/spec/ruby/core/kernel/extend_spec.rb index 482eef32e9..f47c739223 100644 --- a/spec/ruby/core/kernel/extend_spec.rb +++ b/spec/ruby/core/kernel/extend_spec.rb @@ -72,8 +72,8 @@ describe "Kernel#extend" do lambda { @frozen.extend }.should raise_error(ArgumentError) end - it "raises a RuntimeError" do - lambda { @frozen.extend @module }.should raise_error(RuntimeError) + it "raises a #{frozen_error_class}" do + lambda { @frozen.extend @module }.should raise_error(frozen_error_class) end end end diff --git a/spec/ruby/core/kernel/instance_variable_set_spec.rb b/spec/ruby/core/kernel/instance_variable_set_spec.rb index bac1bb5f99..0b6ae57546 100644 --- a/spec/ruby/core/kernel/instance_variable_set_spec.rb +++ b/spec/ruby/core/kernel/instance_variable_set_spec.rb @@ -82,12 +82,12 @@ describe "Kernel#instance_variable_set" do @frozen.ivar.should equal(:origin) end - it "raises a RuntimeError when passed replacement is identical to stored object" do - lambda { @frozen.instance_variable_set(:@ivar, :origin) }.should raise_error(RuntimeError) + it "raises a #{frozen_error_class} when passed replacement is identical to stored object" do + lambda { @frozen.instance_variable_set(:@ivar, :origin) }.should raise_error(frozen_error_class) end - it "raises a RuntimeError when passed replacement is different from stored object" do - lambda { @frozen.instance_variable_set(:@ivar, :replacement) }.should raise_error(RuntimeError) + it "raises a #{frozen_error_class} when passed replacement is different from stored object" do + lambda { @frozen.instance_variable_set(:@ivar, :replacement) }.should raise_error(frozen_error_class) end end end diff --git a/spec/ruby/core/kernel/taint_spec.rb b/spec/ruby/core/kernel/taint_spec.rb index 0c2fb3286b..539eadc407 100644 --- a/spec/ruby/core/kernel/taint_spec.rb +++ b/spec/ruby/core/kernel/taint_spec.rb @@ -13,9 +13,9 @@ describe "Kernel#taint" do o.tainted?.should == true end - it "raises RuntimeError on an untainted, frozen object" do + it "raises #{frozen_error_class} on an untainted, frozen object" do o = Object.new.freeze - lambda { o.taint }.should raise_error(RuntimeError) + lambda { o.taint }.should raise_error(frozen_error_class) end it "does not raise an error on a tainted, frozen object" do diff --git a/spec/ruby/core/kernel/trust_spec.rb b/spec/ruby/core/kernel/trust_spec.rb index a9fda5c5c6..81ac9cc730 100644 --- a/spec/ruby/core/kernel/trust_spec.rb +++ b/spec/ruby/core/kernel/trust_spec.rb @@ -13,9 +13,9 @@ describe "Kernel#trust" do o.untrusted?.should == false end - it "raises RuntimeError on an untrusted, frozen object" do + it "raises #{frozen_error_class} on an untrusted, frozen object" do o = Object.new.untrust.freeze - lambda { o.trust }.should raise_error(RuntimeError) + lambda { o.trust }.should raise_error(frozen_error_class) end it "does not raise an error on a trusted, frozen object" do diff --git a/spec/ruby/core/kernel/untaint_spec.rb b/spec/ruby/core/kernel/untaint_spec.rb index 5abe5d63fc..d54714cee4 100644 --- a/spec/ruby/core/kernel/untaint_spec.rb +++ b/spec/ruby/core/kernel/untaint_spec.rb @@ -13,9 +13,9 @@ describe "Kernel#untaint" do o.tainted?.should == false end - it "raises RuntimeError on a tainted, frozen object" do + it "raises #{frozen_error_class} on a tainted, frozen object" do o = Object.new.taint.freeze - lambda { o.untaint }.should raise_error(RuntimeError) + lambda { o.untaint }.should raise_error(frozen_error_class) end it "does not raise an error on an untainted, frozen object" do diff --git a/spec/ruby/core/kernel/untrust_spec.rb b/spec/ruby/core/kernel/untrust_spec.rb index 280a465807..903567a5ed 100644 --- a/spec/ruby/core/kernel/untrust_spec.rb +++ b/spec/ruby/core/kernel/untrust_spec.rb @@ -13,9 +13,9 @@ describe "Kernel#untrust" do o.untrusted?.should == true end - it "raises RuntimeError on a trusted, frozen object" do + it "raises #{frozen_error_class} on a trusted, frozen object" do o = Object.new.freeze - lambda { o.untrust }.should raise_error(RuntimeError) + lambda { o.untrust }.should raise_error(frozen_error_class) end it "does not raise an error on an untrusted, frozen object" do |