Integration generator deprecation

Changelog.md

@@ -6,6 +6,12 @@ Breaking Changes:
 * Change the order of `after_teardown` from `after` to `around` in system
   specs to improve compatibility with extensions and Capybara. (Tim Diggins, #2596)
 
+Deprecations:
+
+* Deprecates integration spec generator (`rspec:integration`)
+  which was an alias of request spec generator (`rspec:request`)
+  (Luka Lüdicke, #2374)
+
 ### 6.0.0.rc1
 
 Enhancements:

example_app_generator/generate_stuff.rb

@@ -89,7 +89,7 @@ def using_source_path(path)
 # request specs are now the default
 generate('rspec:controller wombats --no-request-specs --controller-specs --no-view-specs')
 
-generate('integration_test widgets')
+generate('integration_test widgets') # deprecated
 generate('mailer Notifications signup')
 
 generate('model thing name:string')

lib/generators/rspec/integration/integration_generator.rb

@@ -1,19 +1,26 @@
 require 'generators/rspec'
+require 'rspec/core/warnings'
 
 module Rspec
   module Generators
     # @private
     class IntegrationGenerator < Base
-      # Add a deprecation for this class, before rspec-rails 4, to use the
-      # `RequestGenerator` instead
       class_option :request_specs,
                    type: :boolean,
                    default: true,
                    desc: "Generate request specs"
 
+      source_paths << File.expand_path('../request/templates', __dir__)
+
       def generate_request_spec
         return unless options[:request_specs]
 
+        RSpec.warn_deprecation <<-WARNING.gsub(/\s*\|/, ' ')
+          |The integration generator is deprecated
+          |and will be deleted in RSpec-Rails 7.
+          |Please use the request generator instead.
+        WARNING
+
         template 'request_spec.rb',
                  File.join('spec/requests', "#{name.underscore.pluralize}_spec.rb")
       end

lib/generators/rspec/request/request_generator.rb

@@ -1,10 +1,17 @@
-require 'generators/rspec/integration/integration_generator'
+require 'generators/rspec'
 
 module Rspec
   module Generators
     # @private
-    class RequestGenerator < IntegrationGenerator
-      source_paths << File.expand_path('../integration/templates', __dir__)
+    class RequestGenerator < Base
+      class_option :request_specs, type: :boolean, default: true, desc: 'Generate request specs'
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        template 'request_spec.rb',
+                 File.join('spec/requests', "#{name.underscore.pluralize}_spec.rb")
+      end
     end
   end
 end

spec/generators/rspec/integration/integration_generator_spec.rb

@@ -1,8 +1,14 @@
 # Generators are not automatically loaded by Rails
 require 'generators/rspec/integration/integration_generator'
 require 'support/generators'
+require 'rspec/core/warnings'
 
 RSpec.describe Rspec::Generators::IntegrationGenerator, type: :generator do
   setup_default_destination
   it_behaves_like "a request spec generator"
+
+  it 'is deprecated' do
+    expect(RSpec).to receive(:warn_deprecation)
+    run_generator %w[posts]
+  end
 end