@@ -346,7 +346,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader if File.exists?(initfile) STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing? load(initfile) - elsif Merb.env != "test" + elsif !Merb.testing? Merb.fatal! "You are not in a Merb application, or you are in " \ "a flat application and have not specified the init file. If you " \ "are trying to create a new merb application, use merb-gen app." lib/merb-core/bootloader.rb 428d9480a49cee31e72d709a9fed0a6785d0b14c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/037c6ece4b745eb7042bd49df2806ab4f77db332 037c6ece4b745eb7042bd49df2806ab4f77db332 2008-10-09T16:13:19-07:00 2008-10-09T16:13:19-07:00 Handle cases when testing env is set using and so forth. 9dd480ac5f35a238f01022684c5aa03c617a7c10 Michael S. Klishin michael@novemberain.com