From 7de5f69cc6bc9a946afd3a0fa0ec785f9fb94fb5 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 5 Oct 2009 10:01:46 -0500 Subject: Try to load lib before trying to activate the gem for testing --- railties/test/abstract_unit.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'railties') diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 4510e6241c..50c427dc64 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -27,8 +27,12 @@ else end def uses_gem(gem_name, test_name, version = '> 0') - gem gem_name.to_s, version - require gem_name.to_s + begin + require gem_name.to_s + rescue LoadError + gem gem_name.to_s, version + require gem_name.to_s + end yield rescue LoadError $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again." -- cgit v1.2.3