Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_E…
…NV"] = "production" in config/environment.rb doesnt wreck havok [DHH] (closes #2660)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2955 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Nov 9, 2005
1 parent 6422f8b commit 5c48a89
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*

* Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [DHH] #2660

* Correct versioning in :freeze_gems Rake task. #2778 [jakob@mentalized.net, Jeremy Kemper]

* Added an omnipresent RailsInfoController with a properties action that delivers an HTML rendering of Rails::Info (but only when local_request? is true). Added a new default index.html which fetches this with Ajax. [Sam Stephenson]
Expand Down
6 changes: 3 additions & 3 deletions railties/environments/environment.rb
@@ -1,8 +1,8 @@
# Be sure to restart your web server when you modify this file.

# Uncomment below to force Rails into production mode
# (Use only when you can't set environment variables through your web/app server)
# ENV['RAILS_ENV'] ||= 'production' # Keep the ||=, don't use =, or tests will wipe production db
# Uncomment below to force Rails into production mode when
# you don't control web/app server and can't set it the proper way
# ENV['RAILS_ENV'] ||= 'production'

# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
Expand Down
4 changes: 4 additions & 0 deletions railties/lib/test_help.rb
@@ -1,5 +1,9 @@
require 'application'

# Make double-sure the RAILS_ENV is set to test,
# so fixtures are loaded to the right database
silence_warnings { RAILS_ENV = "test" }

require 'test/unit'
require 'active_record/fixtures'
require 'action_controller/test_process'
Expand Down

0 comments on commit 5c48a89

Please sign in to comment.