From d3ab9093d7401028eee361030cfadd9ef2c64c65 Mon Sep 17 00:00:00 2001 From: Eloy Espinaco Date: Wed, 17 Jun 2020 17:36:34 -0300 Subject: [PATCH 1/3] Use consistent naming for request specs Controller generators are using a different naming scheme for requests specs that are now generated by default. Use always `spec/requests/posts_spec.rb` by default. This --- lib/generators/rspec/controller/controller_generator.rb | 2 +- spec/generators/rspec/controller/controller_generator_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generators/rspec/controller/controller_generator.rb b/lib/generators/rspec/controller/controller_generator.rb index 58c7f3db64..c03ae83184 100644 --- a/lib/generators/rspec/controller/controller_generator.rb +++ b/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 diff --git a/spec/generators/rspec/controller/controller_generator_spec.rb b/spec/generators/rspec/controller/controller_generator_spec.rb index 256be0be78..8516703f23 100644 --- a/spec/generators/rspec/controller/controller_generator_spec.rb +++ b/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] From 9f0bc1fb893e9a26361184706a911cc3d0b4a55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Lu=CC=88dicke?= Date: Fri, 21 Aug 2020 14:53:18 +0200 Subject: [PATCH 2/3] Changelog entry for #2355 --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 7410738d9b..b0470a8012 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,8 @@ Enhancements: * Issue a warning when using job matchers with `#at` mis-match on `usec` precision. (Jon Rowe, #2350) +* Generate request specs with consistent file naming, without `request_spec` suffix. + (Eloy Espinaco, #2355) Bug Fixes: From b1e05e0c399476fb83cc585e10a8296e493c8a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Lu=CC=88dicke?= Date: Fri, 21 Aug 2020 16:03:42 +0200 Subject: [PATCH 3/3] Reduce dependencies between smoke tests for request spec generators --- example_app_generator/generate_stuff.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb index 581bb9ca78..b0d905c48f 100644 --- a/example_app_generator/generate_stuff.rb +++ b/example_app_generator/generate_stuff.rb @@ -84,8 +84,12 @@ def using_source_path(path) generate('rspec:install') generate('controller wombats index') # plural generate('controller welcome index') # singular -generate('rspec:request wombats') -generate('integration_test widgets') +# Generate controllers so that Rails generates routes +generate('controller logins index --no-request_specs --no-view_specs --no-helper_specs') +generate('controller signups index --no-request_specs --no-view_specs --no-helper_specs') +# The generated specs from IntegrationGenerator rely on index routes being present +generate('rspec:request logins') +generate('integration_test signups') generate('mailer Notifications signup') generate('model thing name:string')