diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-17 08:48:41 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-17 08:48:41 +0000 |
| commit | e60d21cb129d1de487ebedd6b5e9efb22913130d (patch) | |
| tree | aa1f987ff0d92b2d819f39d89afe2d3d6d821679 /spec/spec_helper.rb | |
| parent | 9ab3cf355db5b8b6c558aea4744c2803fa658176 (diff) | |
| parent | bae21e38242aac2c5843bae5ea5fe3b09408a4f9 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9bf752c99..6c3a947ba 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,6 @@ # This file is copied to ~/spec when you run 'ruby script/generate rspec' # from the project root directory. -ENV["RAILS_ENV"] ||= 'test' +ENV["RAILS_ENV"] = 'test' require File.expand_path(File.join('..', '..', 'config', 'environment'), __FILE__) require 'spec/autorun' require 'spec/rails' |