summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-07-12 09:21:40 -0700
committerAndre Arko <andre@arko.net>2010-07-15 01:19:39 -0700
commit4d19f45578a0ddb0ec99f260de8d5208c8659824 (patch)
tree466f93e0366da5c0fdc8847fd661837a91ad3d37
parent5665eef2785fe4344e4a7818b2a332f530dd66ce (diff)
downloadbundler-4d19f45578a0ddb0ec99f260de8d5208c8659824.tar.gz
Remove differ gem
-rw-r--r--spec/lock/flex_spec.rb3
-rw-r--r--spec/spec_helper.rb8
2 files changed, 2 insertions, 9 deletions
diff --git a/spec/lock/flex_spec.rb b/spec/lock/flex_spec.rb
index 4c878c4bcb..768d65cc8f 100644
--- a/spec/lock/flex_spec.rb
+++ b/spec/lock/flex_spec.rb
@@ -8,7 +8,8 @@ describe "the lockfile format" do
expected.gsub!(/^#{spaces}/, '')
simple_matcher "should be" do |given, m|
- m.failure_message = "The lockfile did not match what you expected:\n===============\n" << Differ.diff_by_line(expected, given).to_s << "\n===============\n"
+ m.failure_message = "The lockfile did not match.\n=== Expected:\n" <<
+ expected << "\n=== Got:\n" << given << "\n===========\n"
expected == given
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7df3a9b6df..646b242c5c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,12 +6,6 @@ require 'rubygems'
require 'bundler'
require 'spec'
-begin
- require 'differ'
-rescue LoadError
- abort "You need the `differ' gem installed to run the tests"
-end
-
Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
require file
end
@@ -19,8 +13,6 @@ end
$debug = false
$show_err = true
-Differ.format = :color
-
Spec::Rubygems.setup
FileUtils.rm_rf(Spec::Path.gem_repo1)
ENV['RUBYOPT'] = "-I#{Spec::Path.root}/spec/support/rubygems_hax"