From f53243d843aa4b08d24db4ad1e43688e0a534a39 Mon Sep 17 00:00:00 2001 From: Terence Lee Date: Sat, 1 Oct 2011 21:37:31 -0500 Subject: #1458. refactor load error tests --- spec/runtime/require_spec.rb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'spec/runtime/require_spec.rb') diff --git a/spec/runtime/require_spec.rb b/spec/runtime/require_spec.rb index b336ed9a7a..bad1ec9730 100644 --- a/spec/runtime/require_spec.rb +++ b/spec/runtime/require_spec.rb @@ -82,15 +82,11 @@ describe "Bundler.require" do gem "two", :require => 'fail' G - run <<-R - begin - Bundler.require - rescue LoadError => e - puts "ZOMG ERROR" if e.message.include?("-- fail") - end + load_error_run <<-R, 'fail' + Bundler.require R - out.should == "ZOMG ERROR" + err.should == "ZOMG LOAD ERROR" end describe "using bundle exec" do @@ -192,14 +188,10 @@ describe "Bundler.require" do gem "busted_require" G - run <<-R - begin - Bundler.require - rescue LoadError => e - puts 'ZOMG ERROR' if e.message.include?("-- no_such_file_omg") - end + load_error_run <<-R, 'no_such_file_omg' + Bundler.require R - out.should == 'ZOMG ERROR' + err.should == 'ZOMG LOAD ERROR' end end end -- cgit v1.2.1