lib/combustion/application.rb in combustion-0.3.1 vs lib/combustion/application.rb in combustion-0.3.2
- old
+ new
@@ -1,10 +1,8 @@
Rails.env = 'test'
class Combustion::Application < Rails::Application
- config.root = File.expand_path File.join(Dir.pwd, 'spec', 'internal')
-
# Core Settings
config.cache_classes = true
config.whiny_nils = true
config.consider_all_requests_local = true
config.secret_token = Digest::SHA1.hexdigest Time.now.to_s
@@ -14,9 +12,11 @@
# Some settings we're not sure if we want, so let's not load them by default.
# Instead, wait for this method to be invoked (to get around load-order
# complications).
def self.configure_for_combustion
+ config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
+
if defined?(ActionController) && defined?(ActionController::Engine)
config.action_dispatch.show_exceptions = false
config.action_controller.perform_caching = false
config.action_controller.allow_forgery_protection = false
end