6 files changed, 16 insertions, 17 deletions
diff --git a/spec/ruby/library/singleton/allocate_spec.rb b/spec/ruby/library/singleton/allocate_spec.rb
index 6a1512d53b..a0094fb32a 100644
--- a/spec/ruby/library/singleton/allocate_spec.rb
+++ b/spec/ruby/library/singleton/allocate_spec.rb
@@ -3,6 +3,6 @@ require_relative 'fixtures/classes'
 
 describe "Singleton.allocate" do
   it "is a private method" do
-    -> { SingletonSpecs::MyClass.allocate }.should raise_error(NoMethodError)
+    -> { SingletonSpecs::MyClass.allocate }.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/library/singleton/clone_spec.rb b/spec/ruby/library/singleton/clone_spec.rb
index 3635bcd594..a7b7b731f5 100644
--- a/spec/ruby/library/singleton/clone_spec.rb
+++ b/spec/ruby/library/singleton/clone_spec.rb
@@ -3,6 +3,6 @@ require_relative 'fixtures/classes'
 
 describe "Singleton#clone" do
   it "is prevented" do
-    -> { SingletonSpecs::MyClass.instance.clone }.should raise_error(TypeError)
+    -> { SingletonSpecs::MyClass.instance.clone }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/singleton/dup_spec.rb b/spec/ruby/library/singleton/dup_spec.rb
index 13d5a213e9..a0455f37b7 100644
--- a/spec/ruby/library/singleton/dup_spec.rb
+++ b/spec/ruby/library/singleton/dup_spec.rb
@@ -3,6 +3,6 @@ require_relative 'fixtures/classes'
 
 describe "Singleton#dup" do
   it "is prevented" do
-    -> { SingletonSpecs::MyClass.instance.dup }.should raise_error(TypeError)
+    -> { SingletonSpecs::MyClass.instance.dup }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/singleton/instance_spec.rb b/spec/ruby/library/singleton/instance_spec.rb
index 1679728d4c..20cac602b5 100644
--- a/spec/ruby/library/singleton/instance_spec.rb
+++ b/spec/ruby/library/singleton/instance_spec.rb
@@ -3,28 +3,28 @@ require_relative 'fixtures/classes'
 
 describe "Singleton.instance" do
   it "returns an instance of the singleton class" do
-    SingletonSpecs::MyClass.instance.should be_kind_of(SingletonSpecs::MyClass)
+    SingletonSpecs::MyClass.instance.should.is_a?(SingletonSpecs::MyClass)
   end
 
   it "returns the same instance for multiple calls to instance" do
-    SingletonSpecs::MyClass.instance.should equal(SingletonSpecs::MyClass.instance)
+    SingletonSpecs::MyClass.instance.should.equal?(SingletonSpecs::MyClass.instance)
   end
 
   it "returns an instance of the singleton's subclasses" do
-    SingletonSpecs::MyClassChild.instance.should be_kind_of(SingletonSpecs::MyClassChild)
+    SingletonSpecs::MyClassChild.instance.should.is_a?(SingletonSpecs::MyClassChild)
   end
 
   it "returns the same instance for multiple class to instance on subclasses" do
-    SingletonSpecs::MyClassChild.instance.should equal(SingletonSpecs::MyClassChild.instance)
+    SingletonSpecs::MyClassChild.instance.should.equal?(SingletonSpecs::MyClassChild.instance)
   end
 
   it "returns an instance of the singleton's clone" do
     klone = SingletonSpecs::MyClassChild.clone
-    klone.instance.should be_kind_of(klone)
+    klone.instance.should.is_a?(klone)
   end
 
   it "returns the same instance for multiple class to instance on clones" do
     klone = SingletonSpecs::MyClassChild.clone
-    klone.instance.should equal(klone.instance)
+    klone.instance.should.equal?(klone.instance)
   end
 end
diff --git a/spec/ruby/library/singleton/load_spec.rb b/spec/ruby/library/singleton/load_spec.rb
index 4c753f9e7a..ab95d14640 100644
--- a/spec/ruby/library/singleton/load_spec.rb
+++ b/spec/ruby/library/singleton/load_spec.rb
@@ -1,21 +1,20 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-# TODO: change to a.should be_equal(b)
 # TODO: write spec for cloning classes and calling private methods
 # TODO: write spec for private_methods not showing up via extended
 describe "Singleton._load" do
   it "returns the singleton instance for anything passed in" do
     klass = SingletonSpecs::MyClass
-    klass._load("").should equal(klass.instance)
-    klass._load("42").should equal(klass.instance)
-    klass._load(42).should equal(klass.instance)
+    klass._load("").should.equal?(klass.instance)
+    klass._load("42").should.equal?(klass.instance)
+    klass._load(42).should.equal?(klass.instance)
   end
 
   it "returns the singleton instance for anything passed in to subclass" do
     subklass = SingletonSpecs::MyClassChild
-    subklass._load("").should equal(subklass.instance)
-    subklass._load("42").should equal(subklass.instance)
-    subklass._load(42).should equal(subklass.instance)
+    subklass._load("").should.equal?(subklass.instance)
+    subklass._load("42").should.equal?(subklass.instance)
+    subklass._load(42).should.equal?(subklass.instance)
   end
 end
diff --git a/spec/ruby/library/singleton/new_spec.rb b/spec/ruby/library/singleton/new_spec.rb
index 2f45db819c..6167231a29 100644
--- a/spec/ruby/library/singleton/new_spec.rb
+++ b/spec/ruby/library/singleton/new_spec.rb
@@ -3,6 +3,6 @@ require_relative 'fixtures/classes'
 
 describe "Singleton.new" do
   it "is a private method" do
-    -> { SingletonSpecs::NewSpec.new }.should raise_error(NoMethodError)
+    -> { SingletonSpecs::NewSpec.new }.should.raise(NoMethodError)
   end
 end