test/cli/test_error_handler.rb in nanoc-3.5.0 vs test/cli/test_error_handler.rb in nanoc-3.6.0

@@ -2,28 +2,33 @@
 
 class Nanoc::CLI::ErrorHandlerTest < MiniTest::Unit::TestCase
 
   include Nanoc::TestHelpers
 
+  def setup
+    super
+    @handler = Nanoc::CLI::ErrorHandler.new
+  end
+
   def test_resolution_for_with_unknown_gem
     error = LoadError.new('no such file to load -- afjlrestjlsgrshter')
-    assert_nil handler.send(:resolution_for, error)
+    assert_nil @handler.send(:resolution_for, error)
   end
 
-  def test_resolution_for_with_known_gem
-    $loud = true
+  def test_resolution_for_with_known_gem_without_bundler
+    def @handler.using_bundler? ; false ; end
     error = LoadError.new('no such file to load -- kramdown')
-    assert_match(/^Try installing /, handler.send(:resolution_for, error))
-  ensure
-    $loud = false
+    assert_match(/^Install the 'kramdown' gem using `gem install kramdown`./, @handler.send(:resolution_for, error))
   end
 
-  def test_resolution_for_with_not_load_error
-    error = RuntimeError.new('nuclear meltdown detected')
-    assert_nil handler.send(:resolution_for, error)
+  def test_resolution_for_with_known_gem_with_bundler
+    def @handler.using_bundler? ; true ; end
+    error = LoadError.new('no such file to load -- kramdown')
+    assert_match(/^Make sure the gem is added to Gemfile/, @handler.send(:resolution_for, error))
   end
 
-  def handler
-    Nanoc::CLI::ErrorHandler.new
+  def test_resolution_for_with_not_load_error
+    error = RuntimeError.new('nuclear meltdown detected')
+    assert_nil @handler.send(:resolution_for, error)
   end
 
 end