wip: fixes to make diesel more useful for saucy

thoughtbot · Jan 5, 2011 · 64053a8 · 64053a8
1 parent 4430773
commit 64053a8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/lib/diesel/testing/app/controllers/application_controller.rb b/lib/diesel/testing/app/controllers/application_controller.rb
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+end
+
diff --git a/lib/diesel/testing/app/views/layouts/application.html.erb b/lib/diesel/testing/app/views/layouts/application.html.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/lib/diesel/testing/application.rb b/lib/diesel/testing/application.rb
@@ -7,7 +7,10 @@ module Testing
     class Application < Rails::Application
       config.encoding = "utf-8"
       config.action_mailer.default_url_options = { :host => 'localhost' }
-      config.paths.config.database = "#{APP_ROOT}/database.yml"
+      config.paths.config.database = "#{APP_ROOT}/config/database.yml"
+      config.paths.config.routes = "#{APP_ROOT}/config/routes.rb"
+      config.paths.app.views << "#{APP_ROOT}/app/views"
+      config.paths.app.controllers << "#{APP_ROOT}/app/controllers"
       config.paths.log = "tmp/log"
       config.cache_classes = true
       config.whiny_nils = true

diff --git a/lib/diesel/testing/database.yml → lib/diesel/testing/config/database.yml b/lib/diesel/testing/database.yml → lib/diesel/testing/config/database.yml
diff --git a/lib/diesel/testing/config/routes.rb b/lib/diesel/testing/config/routes.rb
@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  root :to => "application#show"
+end
+