8 files changed, 23 insertions, 29 deletions
diff --git a/spec/ruby/library/digest/md5/append_spec.rb b/spec/ruby/library/digest/md5/append_spec.rb
index a7f841c883..6f42e4f286 100644
--- a/spec/ruby/library/digest/md5/append_spec.rb
+++ b/spec/ruby/library/digest/md5/append_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
 require_relative 'shared/constants'
-require_relative 'shared/update'
 
 describe "Digest::MD5#<<" do
- it_behaves_like :md5_update, :<<
+  it "can update" do
+    cur_digest = Digest::MD5.new
+    cur_digest << MD5Constants::Contents
+    cur_digest.digest.should == MD5Constants::Digest
+  end
 end
diff --git a/spec/ruby/library/digest/md5/file_spec.rb b/spec/ruby/library/digest/md5/file_spec.rb
index 0c8d12cbc9..9a78a8c055 100644
--- a/spec/ruby/library/digest/md5/file_spec.rb
+++ b/spec/ruby/library/digest/md5/file_spec.rb
@@ -15,7 +15,7 @@ describe "Digest::MD5.file" do
     end
 
     it "returns a Digest::MD5 object" do
-      Digest::MD5.file(@file).should be_kind_of(Digest::MD5)
+      Digest::MD5.file(@file).should.is_a?(Digest::MD5)
     end
 
     it "returns a Digest::MD5 object with the correct digest" do
@@ -26,7 +26,7 @@ describe "Digest::MD5.file" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(@file)
       result = Digest::MD5.file(obj)
-      result.should be_kind_of(Digest::MD5)
+      result.should.is_a?(Digest::MD5)
       result.digest.should == MD5Constants::Digest
     end
   end
@@ -34,10 +34,10 @@ describe "Digest::MD5.file" do
   it_behaves_like :file_read_directory, :file, Digest::MD5
 
   it "raises a Errno::ENOENT when passed a path that does not exist" do
-    -> { Digest::MD5.file("") }.should raise_error(Errno::ENOENT)
+    -> { Digest::MD5.file("") }.should.raise(Errno::ENOENT)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { Digest::MD5.file(nil) }.should raise_error(TypeError)
+    -> { Digest::MD5.file(nil) }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/digest/md5/length_spec.rb b/spec/ruby/library/digest/md5/length_spec.rb
index b05b2a20fd..18bda51129 100644
--- a/spec/ruby/library/digest/md5/length_spec.rb
+++ b/spec/ruby/library/digest/md5/length_spec.rb
@@ -1,7 +1,11 @@
 require_relative '../../../spec_helper'
 require_relative 'shared/constants'
-require_relative 'shared/length'
 
 describe "Digest::MD5#length" do
-  it_behaves_like :md5_length, :length
+  it "returns the length of the digest" do
+    cur_digest = Digest::MD5.new
+    cur_digest.length.should == MD5Constants::BlankDigest.size
+    cur_digest << MD5Constants::Contents
+    cur_digest.length.should == MD5Constants::Digest.size
+  end
 end
diff --git a/spec/ruby/library/digest/md5/shared/constants.rb b/spec/ruby/library/digest/md5/shared/constants.rb
index e807b96f9f..664dd18e9c 100644
--- a/spec/ruby/library/digest/md5/shared/constants.rb
+++ b/spec/ruby/library/digest/md5/shared/constants.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 require 'digest/md5'
 
 module MD5Constants
diff --git a/spec/ruby/library/digest/md5/shared/length.rb b/spec/ruby/library/digest/md5/shared/length.rb
deleted file mode 100644
index c5b2b97b58..0000000000
--- a/spec/ruby/library/digest/md5/shared/length.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-describe :md5_length, shared: true do
-  it "returns the length of the digest" do
-    cur_digest = Digest::MD5.new
-    cur_digest.send(@method).should == MD5Constants::BlankDigest.size
-    cur_digest << MD5Constants::Contents
-    cur_digest.send(@method).should == MD5Constants::Digest.size
-  end
-end
diff --git a/spec/ruby/library/digest/md5/shared/update.rb b/spec/ruby/library/digest/md5/shared/update.rb
deleted file mode 100644
index be8622aed5..0000000000
--- a/spec/ruby/library/digest/md5/shared/update.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-describe :md5_update, shared: true do
-  it "can update" do
-    cur_digest = Digest::MD5.new
-    cur_digest.send @method, MD5Constants::Contents
-    cur_digest.digest.should == MD5Constants::Digest
-  end
-end
diff --git a/spec/ruby/library/digest/md5/size_spec.rb b/spec/ruby/library/digest/md5/size_spec.rb
index 22e3272d36..54709234de 100644
--- a/spec/ruby/library/digest/md5/size_spec.rb
+++ b/spec/ruby/library/digest/md5/size_spec.rb
@@ -1,7 +1,8 @@
 require_relative '../../../spec_helper'
 require_relative 'shared/constants'
-require_relative 'shared/length'
 
 describe "Digest::MD5#size" do
-  it_behaves_like :md5_length, :size
+  it "is an alias of Digest::MD5#length" do
+    Digest::MD5.instance_method(:size).should == Digest::MD5.instance_method(:length)
+  end
 end
diff --git a/spec/ruby/library/digest/md5/update_spec.rb b/spec/ruby/library/digest/md5/update_spec.rb
index 4773db308c..830ccfead6 100644
--- a/spec/ruby/library/digest/md5/update_spec.rb
+++ b/spec/ruby/library/digest/md5/update_spec.rb
@@ -1,7 +1,8 @@
 require_relative '../../../spec_helper'
-require_relative 'shared/constants'
-require_relative 'shared/update'
+require 'digest'
 
 describe "Digest::MD5#update" do
-  it_behaves_like :md5_update, :update
+  it "is an alias of Digest::MD5#<<" do
+    Digest::MD5.instance_method(:update).should == Digest::MD5.instance_method(:<<)
+  end
 end