Changeset 800

Show
Ignore:
Timestamp:
10/30/07 21:47:52 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Tell spec_helper about the framework/ frozen copy if it is there (Closes #237)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/spec/spec_helper.rb

    r718 r800  
    11$TESTING=true 
    2 require 'merb' 
     2FROZEN_FRAMEWORK_PATH=File.join(File.dirname(__FILE__), "../framework") 
     3if File.directory?(FROZEN_FRAMEWORK_PATH) 
     4  $:.unshift FROZEN_FRAMEWORK_PATH 
     5  require FROZEN_FRAMEWORK_PATH + "/merb" 
     6else   
     7  require 'merb' 
     8end 
     9 
    310require File.join(MERB_ROOT, 'config', 'merb_init') 
    411