Cleaned up the handling of the config directory

wycats · Dec 23, 2008 · 8094af6 · 8094af6
1 parent 60460b2
commit 8094af6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/merb_sequel/lib/merb/orms/sequel/connection.rb b/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

diff --git a/merb_sequel/spec/spec_helper.rb b/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|