app_generators/merb/templates/spec/spec_helper.rb in merb-0.5.0 vs app_generators/merb/templates/spec/spec_helper.rb in merb-0.5.1
- old
+ new
@@ -1,7 +1,7 @@
-Merb.environment="test"
$TESTING=true
require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
+Merb.environment="test"
require File.join(Merb.root, 'config', 'merb_init')
require 'merb/test/helper'
require 'merb/test/rspec'