Revert rspec/-rails requirement, add integration specs to suite of au…

…tomatically run specs.
yevgeny · Nov 30, 2008 · cb43dda · cb43dda
1 parent d12dd85
commit cb43dda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -29,8 +29,4 @@
 # 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
-
-# Make sure Rspec is required.
-config.gem 'rspec'
-config.gem 'rspec-rails'
+config.action_mailer.delivery_method = :test
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
@@ -17,7 +17,7 @@ task :stats => "spec:statsetup"
 
 desc 'Run all specs in spec directory (excluding plugin & generator specs)'
 task :spec => spec_prereq do
-  errors = %w(spec:models spec:controllers spec:views spec:helpers spec:lib spec:generators).collect do |task|
+  errors = %w(spec:integration spec:models spec:controllers spec:views spec:helpers spec:lib spec:generators).collect do |task|
     begin
       puts %{\nRunning #{task.gsub('spec:', '').titlecase} Spec Task}
       Rake::Task[task].invoke
@@ -111,6 +111,7 @@ namespace :spec do
     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
     ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
     ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration')
     ::STATS_DIRECTORIES << %w(Generator\ specs spec/generators) if File.exist?('spec/generators')
     ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
     ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')