diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-02-25 11:47:14 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-02-25 11:47:14 +0000 |
| commit | 224b8a4ba3a24af91068505c7907724448a4096d (patch) | |
| tree | 54a0d0c08605c6bc16e4a5e6b5b8e4d02936e9f2 | |
| parent | 4a239ae108a834cc5e73b8b9ab53cd30b4f8dd52 (diff) | |
ensure tests run with test environment
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/test.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index c6b9bd263..d15af3336 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -21,5 +21,3 @@ config.action_mailer.delivery_method = :sendmail # so is queued, rather than giv # unintentionally kept references to objects, especially strings. # require 'memory_profiler' # MemoryProfiler.start :string_debug => true, :delay => 10 - - diff --git a/config/environments/test.rb b/config/environments/test.rb index f0689b924..bbca20a31 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -16,4 +16,4 @@ config.action_controller.perform_caching = false # Tell ActionMailer 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
\ No newline at end of file +config.action_mailer.delivery_method = :test diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 127d10dbe..25bdb229a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,7 @@ # This file is copied to ~/spec when you run 'ruby script/generate rspec' # from the project root directory. ENV["RAILS_ENV"] = "test" +RAILS_ENV = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'spec/rails' |