All but 3 merb tests pass
This commit is contained in:
parent
b9f6affa3f
commit
aeb6aa056c
@ -10,6 +10,7 @@ module Webrat
|
|||||||
end
|
end
|
||||||
|
|
||||||
if defined?(Merb)
|
if defined?(Merb)
|
||||||
|
puts "************ Booting merb mode"
|
||||||
require File.join(File.dirname(__FILE__), "boot_merb.rb")
|
require File.join(File.dirname(__FILE__), "boot_merb.rb")
|
||||||
else
|
else
|
||||||
require File.join(File.dirname(__FILE__), "boot_rails.rb")
|
require File.join(File.dirname(__FILE__), "boot_rails.rb")
|
||||||
|
Loading…
Reference in New Issue
Block a user