Browse files

Cleaned up the handling of the config directory

  • Loading branch information...
1 parent 60460b2 commit 8094af6d395080766182412202d3d34e0dd79c9d lholden committed Dec 23, 2008
Showing with 2 additions and 6 deletions.
  1. +2 −2 merb_sequel/lib/merb/orms/sequel/connection.rb
  2. +0 −4 merb_sequel/spec/spec_helper.rb
View
4 merb_sequel/lib/merb/orms/sequel/connection.rb
@@ -7,8 +7,8 @@ module Sequel
class << self
- def config_file() Merb.root / "config" / "database.yml" end
- def sample_dest() Merb.root / "config" / "database.yml.sample" end
+ def config_file() Merb.dir_for(:config) / "database.yml" end
+ def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
def copy_sample_config
View
4 merb_sequel/spec/spec_helper.rb
@@ -9,10 +9,6 @@
require File.join( File.dirname(__FILE__), "..", "lib", 'merb_sequel')
-Merb::Config.use do |c|
- c[:session_store] = 'sequel'
-end
-
Merb.start :environment => 'test', :adapter => 'runner', :session_store => 'sequel', :merb_root => File.dirname(__FILE__)
Spec::Runner.configure do |config|

0 comments on commit 8094af6

Please sign in to comment.