Move rails-controller-testing code into RSpec rails configuration.

Author: Sam Phippen

example_app_generator/generate_stuff.rb

@@ -126,14 +126,4 @@ def using_source_path(path)
           'config.warnings = false'
 gsub_file '.rspec', '--warnings', ''
 
-append_to_file 'spec/rails_helper.rb', <<-EOT.gsub(/^ +\|/, '')
-  |RSpec.configure do |config|
-  |  [:controller, :view, :request].each do |type|
-  |    config.include Rails::Controller::Testing::TestProcess, :type => type
-  |    config.include Rails::Controller::Testing::TemplateAssertions, :type => type
-  |    config.include Rails::Controller::Testing::Integration, :type => type
-  |  end
-  |end
-EOT
-
 final_tasks

lib/rspec/rails/configuration.rb

@@ -106,6 +106,14 @@ def filter_rails_from_backtrace!
       config.include RSpec::Rails::ViewExampleGroup,       :type => :view
       config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
 
+      if defined?(::Rails::Controller::Testing)
+        [:controller, :view, :request].each do |type|
+          config.include ::Rails::Controller::Testing::TestProcess, :type => type
+          config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
+          config.include ::Rails::Controller::Testing::Integration, :type => type
+        end
+      end
+
       if defined?(ActionMailer)
         config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
       end