GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

wycats / merb-core fork watch download tarball
public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git 
Handle cases when testing env is set using  and so forth.
michaelklishin (author)
Thu Oct 09 16:13:19 -0700 2008
commit  037c6ece4b745eb7042bd49df2806ab4f77db332
tree    9dd480ac5f35a238f01022684c5aa03c617a7c10
parent  428d9480a49cee31e72d709a9fed0a6785d0b14c
0
lib/merb-core/bootloader.rb 
...
346
347
348
349
 
350
351
352
 
...
346
347
348
 
349
350
351
352
 
0
@@ -346,7 +346,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
       if File.exists?(initfile)
0
         STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing?
0
         load(initfile)
0
-      elsif Merb.env != "test"
0
+      elsif !Merb.testing?
0
         Merb.fatal! "You are not in a Merb application, or you are in " \
0
           "a flat application and have not specified the init file. If you " \
0
           "are trying to create a new merb application, use merb-gen app."

Comments