Use FrozenError instead of frozen_error_class

18 files changed, 60 insertions, 60 deletions

diff --git a/spec/ruby/core/hash/clear_spec.rb b/spec/ruby/core/hash/clear_spec.rb
index e7816acbbc..cf05e36ac9 100644
--- a/spec/ruby/core/hash/clear_spec.rb
+++ b/spec/ruby/core/hash/clear_spec.rb
@@ -25,8 +25,8 @@ describe "Hash#clear" do
     h.default_proc.should_not == nil
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.clear  }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.clear }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.clear  }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.clear }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/compact_spec.rb b/spec/ruby/core/hash/compact_spec.rb
index ec9d4b5d79..2989afc8b7 100644
--- a/spec/ruby/core/hash/compact_spec.rb
+++ b/spec/ruby/core/hash/compact_spec.rb
@@ -51,8 +51,8 @@ describe "Hash#compact!" do
       @hash.freeze
     end
 
-    it "keeps pairs and raises a #{frozen_error_class}" do
-      ->{ @hash.compact! }.should raise_error(frozen_error_class)
+    it "keeps pairs and raises a FrozenError" do
+      ->{ @hash.compact! }.should raise_error(FrozenError)
       @hash.should == @initial_pairs
     end
   end
diff --git a/spec/ruby/core/hash/compare_by_identity_spec.rb b/spec/ruby/core/hash/compare_by_identity_spec.rb
index 0658b4954a..0fd41a4d58 100644
--- a/spec/ruby/core/hash/compare_by_identity_spec.rb
+++ b/spec/ruby/core/hash/compare_by_identity_spec.rb
@@ -80,9 +80,9 @@ describe "Hash#compare_by_identity" do
     @h[o].should == :o
   end
 
-  it "raises a #{frozen_error_class} on frozen hashes" do
+  it "raises a FrozenError on frozen hashes" do
     @h = @h.freeze
-    -> { @h.compare_by_identity }.should raise_error(frozen_error_class)
+    -> { @h.compare_by_identity }.should raise_error(FrozenError)
   end
 
   # Behaviour confirmed in bug #1871
diff --git a/spec/ruby/core/hash/default_proc_spec.rb b/spec/ruby/core/hash/default_proc_spec.rb
index 83ad98e5b6..f4e4803632 100644
--- a/spec/ruby/core/hash/default_proc_spec.rb
+++ b/spec/ruby/core/hash/default_proc_spec.rb
@@ -73,8 +73,8 @@ describe "Hash#default_proc=" do
     end.should raise_error(TypeError)
   end
 
-  it "raises a #{frozen_error_class} if self is frozen" do
-    -> { {}.freeze.default_proc = Proc.new {} }.should raise_error(frozen_error_class)
-    -> { {}.freeze.default_proc = nil }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if self is frozen" do
+    -> { {}.freeze.default_proc = Proc.new {} }.should raise_error(FrozenError)
+    -> { {}.freeze.default_proc = nil }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/default_spec.rb b/spec/ruby/core/hash/default_spec.rb
index 6cad65bb62..d8b62ea196 100644
--- a/spec/ruby/core/hash/default_spec.rb
+++ b/spec/ruby/core/hash/default_spec.rb
@@ -39,8 +39,8 @@ describe "Hash#default=" do
     end
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.default = nil }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.default = nil }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.default = nil }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.default = nil }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/delete_if_spec.rb b/spec/ruby/core/hash/delete_if_spec.rb
index 345a24a726..c9e670ffc3 100644
--- a/spec/ruby/core/hash/delete_if_spec.rb
+++ b/spec/ruby/core/hash/delete_if_spec.rb
@@ -34,9 +34,9 @@ describe "Hash#delete_if" do
     each_pairs.should == delete_pairs
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.delete_if { false } }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.delete_if { true } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.delete_if { false } }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.delete_if { true } }.should raise_error(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :delete_if
diff --git a/spec/ruby/core/hash/delete_spec.rb b/spec/ruby/core/hash/delete_spec.rb
index a69815c1d9..b262e8846b 100644
--- a/spec/ruby/core/hash/delete_spec.rb
+++ b/spec/ruby/core/hash/delete_spec.rb
@@ -37,8 +37,8 @@ describe "Hash#delete" do
     { key => 5 }.delete(key).should == 5
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.delete("foo")  }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.delete("foo") }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.delete("foo")  }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.delete("foo") }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/initialize_spec.rb b/spec/ruby/core/hash/initialize_spec.rb
index 00e1174ec8..d13496ba3b 100644
--- a/spec/ruby/core/hash/initialize_spec.rb
+++ b/spec/ruby/core/hash/initialize_spec.rb
@@ -45,17 +45,17 @@ describe "Hash#initialize" do
     h.send(:initialize).should equal(h)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
+  it "raises a FrozenError if called on a frozen instance" do
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize() }}
-    block.should raise_error(frozen_error_class)
+    block.should raise_error(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize(nil) }  }
-    block.should raise_error(frozen_error_class)
+    block.should raise_error(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize(5) }    }
-    block.should raise_error(frozen_error_class)
+    block.should raise_error(FrozenError)
 
     block = -> { HashSpecs.frozen_hash.instance_eval { initialize { 5 } } }
-    block.should raise_error(frozen_error_class)
+    block.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/keep_if_spec.rb b/spec/ruby/core/hash/keep_if_spec.rb
index 278eafc969..d50d969467 100644
--- a/spec/ruby/core/hash/keep_if_spec.rb
+++ b/spec/ruby/core/hash/keep_if_spec.rb
@@ -27,9 +27,9 @@ describe "Hash#keep_if" do
     h.keep_if { true }.should equal(h)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.keep_if { true } }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.keep_if { false } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.keep_if { true } }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.keep_if { false } }.should raise_error(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :keep_if
diff --git a/spec/ruby/core/hash/rehash_spec.rb b/spec/ruby/core/hash/rehash_spec.rb
index 587935fc43..ff7b644786 100644
--- a/spec/ruby/core/hash/rehash_spec.rb
+++ b/spec/ruby/core/hash/rehash_spec.rb
@@ -59,8 +59,8 @@ describe "Hash#rehash" do
     h.keys.should == [a]
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.rehash  }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.rehash }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.rehash  }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.rehash }.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/reject_spec.rb b/spec/ruby/core/hash/reject_spec.rb
index 1051ebd76c..38589fd880 100644
--- a/spec/ruby/core/hash/reject_spec.rb
+++ b/spec/ruby/core/hash/reject_spec.rb
@@ -89,12 +89,12 @@ describe "Hash#reject!" do
     reject_bang_pairs.should == delete_if_pairs
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that is modified" do
-    -> { HashSpecs.empty_frozen_hash.reject! { true } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance that is modified" do
+    -> { HashSpecs.empty_frozen_hash.reject! { true } }.should raise_error(FrozenError)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that would not be modified" do
-    -> { HashSpecs.frozen_hash.reject! { false } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance that would not be modified" do
+    -> { HashSpecs.frozen_hash.reject! { false } }.should raise_error(FrozenError)
   end
 
   it_behaves_like :hash_iteration_no_block, :reject!
diff --git a/spec/ruby/core/hash/shared/replace.rb b/spec/ruby/core/hash/shared/replace.rb
index b3d098763b..bea64384bb 100644
--- a/spec/ruby/core/hash/shared/replace.rb
+++ b/spec/ruby/core/hash/shared/replace.rb
@@ -37,15 +37,15 @@ describe :hash_replace, shared: true do
     hash_a.default.should == hash_b.default
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that would not be modified" do
+  it "raises a FrozenError if called on a frozen instance that would not be modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, HashSpecs.frozen_hash)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that is modified" do
+  it "raises a FrozenError if called on a frozen instance that is modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 end
diff --git a/spec/ruby/core/hash/shared/select.rb b/spec/ruby/core/hash/shared/select.rb
index bb781817cb..5170af50d6 100644
--- a/spec/ruby/core/hash/shared/select.rb
+++ b/spec/ruby/core/hash/shared/select.rb
@@ -74,12 +74,12 @@ describe :hash_select!, shared: true do
     { a: 1 }.send(@method) { |k,v| v <= 1 }.should == nil
   end
 
-  it "raises a #{frozen_error_class} if called on an empty frozen instance" do
-    -> { HashSpecs.empty_frozen_hash.send(@method) { false } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on an empty frozen instance" do
+    -> { HashSpecs.empty_frozen_hash.send(@method) { false } }.should raise_error(FrozenError)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance that would not be modified" do
-    -> { HashSpecs.frozen_hash.send(@method) { true } }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance that would not be modified" do
+    -> { HashSpecs.frozen_hash.send(@method) { true } }.should raise_error(FrozenError)
   end
 
   it_should_behave_like :hash_iteration_no_block
diff --git a/spec/ruby/core/hash/shared/store.rb b/spec/ruby/core/hash/shared/store.rb
index ff40bef3ef..6e2557eb28 100644
--- a/spec/ruby/core/hash/shared/store.rb
+++ b/spec/ruby/core/hash/shared/store.rb
@@ -86,8 +86,8 @@ describe :hash_store, shared: true do
     h.keys.last.should_not equal(key2)
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.send(@method, 1, 2) }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.send(@method, 1, 2) }.should raise_error(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
diff --git a/spec/ruby/core/hash/shared/update.rb b/spec/ruby/core/hash/shared/update.rb
index 3af41c450a..4bb20e5b85 100644
--- a/spec/ruby/core/hash/shared/update.rb
+++ b/spec/ruby/core/hash/shared/update.rb
@@ -34,10 +34,10 @@ describe :hash_update, shared: true do
     merge_bang_pairs.should == merge_pairs
   end
 
-  it "raises a #{frozen_error_class} on a frozen instance that is modified" do
+  it "raises a FrozenError on a frozen instance that is modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, 1 => 2)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 
   it "checks frozen status before coercing an object with #to_hash" do
@@ -47,14 +47,14 @@ describe :hash_update, shared: true do
     def obj.to_hash() raise Exception, "should not receive #to_hash" end
     obj.freeze
 
-    -> { HashSpecs.frozen_hash.send(@method, obj) }.should raise_error(frozen_error_class)
+    -> { HashSpecs.frozen_hash.send(@method, obj) }.should raise_error(FrozenError)
   end
 
   # see redmine #1571
-  it "raises a #{frozen_error_class} on a frozen instance that would not be modified" do
+  it "raises a FrozenError on a frozen instance that would not be modified" do
     -> do
       HashSpecs.frozen_hash.send(@method, HashSpecs.empty_frozen_hash)
-    end.should raise_error(frozen_error_class)
+    end.should raise_error(FrozenError)
   end
 
   it "does not raise an exception if changing the value of an existing key during iteration" do
diff --git a/spec/ruby/core/hash/shift_spec.rb b/spec/ruby/core/hash/shift_spec.rb
index d9f121e38b..9d43e640f5 100644
--- a/spec/ruby/core/hash/shift_spec.rb
+++ b/spec/ruby/core/hash/shift_spec.rb
@@ -57,9 +57,9 @@ describe "Hash#shift" do
     h.should == {:c => 3}
   end
 
-  it "raises a #{frozen_error_class} if called on a frozen instance" do
-    -> { HashSpecs.frozen_hash.shift  }.should raise_error(frozen_error_class)
-    -> { HashSpecs.empty_frozen_hash.shift }.should raise_error(frozen_error_class)
+  it "raises a FrozenError if called on a frozen instance" do
+    -> { HashSpecs.frozen_hash.shift  }.should raise_error(FrozenError)
+    -> { HashSpecs.empty_frozen_hash.shift }.should raise_error(FrozenError)
   end
 
   it "works when the hash is at capacity" do
diff --git a/spec/ruby/core/hash/transform_keys_spec.rb b/spec/ruby/core/hash/transform_keys_spec.rb
index 32ac89b765..956fd73a47 100644
--- a/spec/ruby/core/hash/transform_keys_spec.rb
+++ b/spec/ruby/core/hash/transform_keys_spec.rb
@@ -113,12 +113,12 @@ ruby_version_is "2.5" do
         @hash.freeze
       end
 
-      it "raises a #{frozen_error_class} on an empty hash" do
-        ->{ {}.freeze.transform_keys!(&:upcase) }.should raise_error(frozen_error_class)
+      it "raises a FrozenError on an empty hash" do
+        ->{ {}.freeze.transform_keys!(&:upcase) }.should raise_error(FrozenError)
       end
 
-      it "keeps pairs and raises a #{frozen_error_class}" do
-        ->{ @hash.transform_keys!(&:upcase) }.should raise_error(frozen_error_class)
+      it "keeps pairs and raises a FrozenError" do
+        ->{ @hash.transform_keys!(&:upcase) }.should raise_error(FrozenError)
         @hash.should == @initial_pairs
       end
 
diff --git a/spec/ruby/core/hash/transform_values_spec.rb b/spec/ruby/core/hash/transform_values_spec.rb
index 8b53b7a522..acb469416a 100644
--- a/spec/ruby/core/hash/transform_values_spec.rb
+++ b/spec/ruby/core/hash/transform_values_spec.rb
@@ -79,12 +79,12 @@ describe "Hash#transform_values!" do
       @hash.freeze
     end
 
-    it "raises a #{frozen_error_class} on an empty hash" do
-      ->{ {}.freeze.transform_values!(&:succ) }.should raise_error(frozen_error_class)
+    it "raises a FrozenError on an empty hash" do
+      ->{ {}.freeze.transform_values!(&:succ) }.should raise_error(FrozenError)
     end
 
-    it "keeps pairs and raises a #{frozen_error_class}" do
-      ->{ @hash.transform_values!(&:succ) }.should raise_error(frozen_error_class)
+    it "keeps pairs and raises a FrozenError" do
+      ->{ @hash.transform_values!(&:succ) }.should raise_error(FrozenError)
       @hash.should == @initial_pairs
     end