1 files changed, 7 insertions, 9 deletions

diff --git a/spec/ruby/core/exception/name_spec.rb b/spec/ruby/core/exception/name_spec.rb
index d1def51f24..6e0e99d194 100644
--- a/spec/ruby/core/exception/name_spec.rb
+++ b/spec/ruby/core/exception/name_spec.rb
@@ -4,27 +4,25 @@ describe "NameError#name" do
   it "returns a method name as a symbol" do
     -> {
       doesnt_exist
-    }.should raise_error(NameError) {|e| e.name.should == :doesnt_exist }
+    }.should.raise(NameError) {|e| e.name.should == :doesnt_exist }
   end
 
   it "returns a constant name as a symbol" do
     -> {
       DoesntExist
-    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+    }.should.raise(NameError) {|e| e.name.should == :DoesntExist }
   end
 
   it "returns a constant name without namespace as a symbol" do
     -> {
       Object::DoesntExist
-    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+    }.should.raise(NameError) {|e| e.name.should == :DoesntExist }
   end
 
   it "returns a class variable name as a symbol" do
     -> {
-      -> {
-        @@doesnt_exist
-      }.should complain(/class variable access from toplevel/)
-    }.should raise_error(NameError) { |e| e.name.should == :@@doesnt_exist }
+      eval("class singleton_class::A; @@doesnt_exist end", binding, __FILE__, __LINE__)
+    }.should.raise(NameError) { |e| e.name.should == :@@doesnt_exist }
   end
 
   it "returns the first argument passed to the method when a NameError is raised from #instance_variable_get" do
@@ -32,7 +30,7 @@ describe "NameError#name" do
 
     -> {
       Object.new.instance_variable_get(invalid_ivar_name)
-    }.should raise_error(NameError) {|e| e.name.should equal(invalid_ivar_name) }
+    }.should.raise(NameError) {|e| e.name.should.equal?(invalid_ivar_name) }
   end
 
   it "returns the first argument passed to the method when a NameError is raised from #class_variable_get" do
@@ -40,6 +38,6 @@ describe "NameError#name" do
 
     -> {
       Object.class_variable_get(invalid_cvar_name)
-    }.should raise_error(NameError) {|e| e.name.should equal(invalid_cvar_name) }
+    }.should.raise(NameError) {|e| e.name.should.equal?(invalid_cvar_name) }
   end
 end