Merge pull request #2378 from rspec/consistent-request-spec-naming

Consistent request spec naming

Author: JonRowe

Changelog.md

@@ -5,6 +5,8 @@ Enhancements:
 
 * Issue a warning when using job matchers with `#at` mis-match on `usec` precision.
   (Jon Rowe, #2350)
+* Generated request specs now have a bare `_spec` suffix instead of `request_spec`.
+  (Eloy Espinaco, Luka Lüdicke, #2355, #2356, #2378)
 
 Bug Fixes:
 

example_app_generator/generate_stuff.rb

@@ -85,7 +85,10 @@ def using_source_path(path)
 generate('rspec:install')
 generate('controller wombats index') # plural
 generate('controller welcome index') # singular
-generate('rspec:request wombats')
+
+# request specs are now the default
+generate('rspec:controller wombats --no-request-specs --controller-specs --no-view-specs')
+
 generate('integration_test widgets')
 generate('mailer Notifications signup')
 

lib/generators/rspec/controller/controller_generator.rb

@@ -16,7 +16,7 @@ def generate_request_spec
         return unless options[:request_specs]
 
         template 'request_spec.rb',
-                 File.join('spec/requests', class_path, "#{file_name}_request_spec.rb")
+                 File.join('spec/requests', class_path, "#{file_name}_spec.rb")
       end
 
       def generate_controller_spec

spec/generators/rspec/controller/controller_generator_spec.rb

@@ -6,7 +6,7 @@
   setup_default_destination
 
   describe 'request specs' do
-    subject { file('spec/requests/posts_request_spec.rb') }
+    subject { file('spec/requests/posts_spec.rb') }
 
     describe 'generated by default' do
       before do
@@ -38,7 +38,7 @@
     end
 
     describe 'with namespace and actions' do
-      subject { file('spec/requests/admin/external/users_request_spec.rb') }
+      subject { file('spec/requests/admin/external/users_spec.rb') }
 
       before do
         run_generator %w[admin::external::users index custom_action]