diff options
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/test.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 | ||||
| m--------- | vendor/rails | 0 |
4 files changed, 3 insertions, 4 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 216998288..8058487ad 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -17,8 +17,8 @@ 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')) # Disable request forgery protection in test environment -config.action_controller.allow_forgery_protection = false
\ No newline at end of file +config.action_controller.allow_forgery_protection = false + diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1204ca3ca..c6e894584 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.join(File.dirname(__FILE__),'..','config','environment')) require 'spec/autorun' require 'spec/rails' diff --git a/vendor/rails b/vendor/rails deleted file mode 160000 -Subproject abc06a2f769e6e451462460610369ccddb45255 |