Changeset 933

Show
Ignore:
Timestamp:
11/10/07 20:28:16 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Merki: page specs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/merki/trunk/config/database.yml

    r930 r933  
    44  :adapter: mysql 
    55  :database: merki_development 
     6  :username: merki 
    67  :host: localhost 
    78 
    …… 
    1314  <<: *defaults 
    1415  :database: merki_production 
    15   :username: the_user 
    1616  :password: secrets 

  • apps/merki/trunk/spec/spec_helper.rb

    r931 r933  
    1 require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    21MERB_ENV="test" 
    32$TESTING=true 
     3require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    44 
    55require File.join(MERB_ROOT, 'config', 'merb_init')