Some of the old habits still linger within the rspec-rails generator

refinery · Jun 30, 2010 · 4378915 · 4378915
1 parent d5cdce3
commit 4378915
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -20,5 +20,3 @@
 # 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.2', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -18,7 +18,7 @@
   # in your config/boot.rb
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+  config.fixture_path = Rails.root + '/spec/fixtures/'
 
   # == Fixtures
   #
@@ -37,7 +37,7 @@
   #
   # You can also declare which fixtures to use (for example fixtures for test/fixtures):
   #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+  # config.fixture_path = Rails.root + '/spec/fixtures/'
   #
   # == Mock Framework
   #