From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Apr 2010 10:59:19 +0000 (+0000)
Subject: Load timecop in the test environment only.
X-Git-Tag: live~6385^2~24
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aab8b230ecdfa9674b043ad4d02b9aa2e36cd29d

Load timecop in the test environment only.
---

diff --git a/config/environment.rb b/config/environment.rb
index c8c874a3c..539af83b2 100644
--- 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'
-  # 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.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 58850a797..a26b6ef92 100644
--- 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
+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'