Load timecop in the test environment only.

diff --git a/config/environment.rb b/config/environment.rb
index c8c874a3c9e8bea9be84a9cad3e3134bae61fa3e..539af83b2971842a09296fe6456493c4c79e3571 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -54,9 +54,6 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'

-  # if Rails.env == "development"
-    config.gem 'timecop'
-  # end

 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 58850a7974fb92dbc7d7cf637466499c8b5dbd1a..a26b6ef9293ec2d155060ab1cad92668723c122e 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -20,3 +20,6 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test

+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'