3 files changed, 11 insertions, 18 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 94f216f8..3813cab8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -17,5 +17,6 @@ Cccms::Application.configure do
   config.action_mailer.raise_delivery_errors = false
 
   config.active_support.deprecation = :log
-  config.serve_static_assets = true
+  config.serve_static_files = true
+  config.eager_load = false
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2f933de1..6f2c5bdd 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -13,6 +13,7 @@ Cccms::Application.configure do
   config.log_level = :info
 
   config.active_support.deprecation = :notify
+  config.eager_load = false
 
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 728e1470..3b2413ea 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,32 +1,23 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
 Cccms::Application.configure do
 
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # config.whiny_nils = true  # removed in Rails 4
 
-  # Show full error reports and disable caching
   config.action_controller.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
 
-  # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  config.active_support.deprecation = :log
+  config.active_support.test_order  = :sorted
+
+  config.active_record.raise_in_transactional_callbacks = true
 
-  config.active_support.deprecation = :raise
+  config.eager_load = false
+  config.serve_static_files = true
+  config.static_cache_control = "public, max-age=3600"
 end