1 files changed, 23 insertions, 29 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 23d9a86..27298c4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,39 +4,33 @@ require 'rubygems'
 require 'pathname'
 require 'psych'
 
-if ENV['COVERAGE']
+if ENV['COVERALLS']
+  require 'coveralls'
+  Coveralls.wear!
+elsif ENV['COVERAGE']
   require 'simplecov'
 
-  if ENV['COVERALLS']
-    require 'coveralls'
-    formatters = Coveralls::SimpleCov::Formatter
-  else
-    def try_require(resource, &block)
-      require resource
-      block.call
-    rescue LoadError
-      nil
-    end
-
-    formatters = [ SimpleCov::Formatter::HTMLFormatter ]
+  def require_do(resource, &block)
+    require resource
+    block.call
+  rescue LoadError
+    nil
+  end
 
-    try_require('simplecov-rcov') { formatters << SimpleCov::Formatter::RcovFormatter }
-    try_require('simplecov-vim/formatter') {
-      formatters << SimpleCov::Formatter::VimFormatter
-    }
-    try_require('simplecov-sublime-ruby-coverage') {
-      formatters << SimpleCov::Formatter::SublimeRubyCoverageFormatter
-    }
+  formatters = [ SimpleCov::Formatter::HTMLFormatter ]
 
-    formatters = if formatters.size == 1
-                   formatters.first
-                 else
-                   SimpleCov::Formatter::MultiFormatter[*formatters]
-                 end
-  end
+  require_do('simplecov-rcov') {
+    formatters << SimpleCov::Formatter::RcovFormatter
+  }
+  require_do('simplecov-vim/formatter') {
+    formatters << SimpleCov::Formatter::VimFormatter
+  }
+  require_do('simplecov-sublime-ruby-coverage') {
+    formatters << SimpleCov::Formatter::SublimeRubyCoverageFormatter
+  }
 
   SimpleCov.start do
-    formatter formatters
+    formatter SimpleCov::Formatter::MultiFormatter[*formatters]
   end
 end
 
@@ -302,14 +296,14 @@ module Diff::LCS::SpecHelper
 
     matcher :be_nil_or_match_values do |ii, s1, s2|
       match do |ee|
-        ee.should satisfy { |vee| vee.nil? || s1[ii] == s2[ee] }
+        expect(ee).to(satisfy { |vee| vee.nil? || s1[ii] == s2[ee] })
       end
     end
 
     matcher :correctly_map_sequence do |s1|
       match do |actual|
         actual.each_with_index { |ee, ii|
-          ee.should be_nil_or_match_values(ii, s1, @s2)
+          expect(ee).to be_nil_or_match_values(ii, s1, @s2)
         }
       end