Skip to content

Commit 66dba07

Browse files
eloyespJonRowe
authored andcommitted
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
1 parent 067b571 commit 66dba07

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

example_app_generator/generate_stuff.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ def using_source_path(path)
8585
generate('rspec:install')
8686
generate('controller wombats index') # plural
8787
generate('controller welcome index') # singular
88-
generate('rspec:request wombats')
88+
89+
# request specs are now the default
90+
generate('rspec:controller wombats --no-request-specs --controller-specs --no-view-specs')
91+
8992
generate('integration_test widgets')
9093
generate('mailer Notifications #')
9194

lib/generators/rspec/controller/controller_generator.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def generate_request_spec
1616
return unless options[:request_specs]
1717

1818
template 'request_spec.rb',
19-
File.join('spec/requests', class_path, "#{file_name}_request_spec.rb")
19+
File.join('spec/requests', class_path, "#{file_name}_spec.rb")
2020
end
2121

2222
def generate_controller_spec

spec/generators/rspec/controller/controller_generator_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
setup_default_destination
77

88
describe 'request specs' do
9-
subject { file('spec/requests/posts_request_spec.rb') }
9+
subject { file('spec/requests/posts_spec.rb') }
1010

1111
describe 'generated by default' do
1212
before do
@@ -38,7 +38,7 @@
3838
end
3939

4040
describe 'with namespace and actions' do
41-
subject { file('spec/requests/admin/external/users_request_spec.rb') }
41+
subject { file('spec/requests/admin/external/users_spec.rb') }
4242

4343
before do
4444
run_generator %w[admin::external::users index custom_action]

0 commit comments

Comments
 (0)