diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
| commit | 37bff4c0154b57b35a3194a9b31a9422496b955b (patch) | |
| tree | 61592a6bb9d1d9fea378a6e4efa8fdf7d5525b8a /config/environments/test.rb | |
| parent | 8b49dc894066e452232cabd09333895487f86986 (diff) | |
| parent | 8acea24f98268fbb9b73b66b9e98a1788a3b30ac (diff) | |
Merge branch 'merged-bundler' into develop
Diffstat (limited to 'config/environments/test.rb')
| -rw-r--r-- | config/environments/test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index be28c3df6..32dc2b1ec 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -19,8 +19,6 @@ config.action_controller.perform_caching = false # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'rspec-rails', :version => '>= 1.3.3', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) -config.gem 'fakeweb', :version => '>=1.3.0' # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false |