Skip to content

Commit f885d15

Browse files
committed
Refactor scaffold generator to lower line length
1 parent 960c03c commit f885d15

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

lib/generators/rspec/scaffold/scaffold_generator.rb

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,20 @@ def initialize(*args, &blk)
2828
def generate_controller_spec
2929
return unless options[:controller_specs]
3030

31-
template_file = File.join(
32-
'spec/controllers',
33-
controller_class_path,
34-
"#{controller_file_name}_controller_spec.rb"
35-
)
3631
if options[:api]
37-
template 'api_controller_spec.rb', template_file
32+
template 'api_controller_spec.rb', template_file(folder: 'controllers', suffix: '_controller')
3833
else
39-
template 'controller_spec.rb', template_file
34+
template 'controller_spec.rb', template_file(folder: 'controllers', suffix: '_controller')
4035
end
4136
end
4237

4338
def generate_request_spec
4439
return unless options[:request_specs]
4540

46-
template_file = File.join(
47-
'spec/requests',
48-
controller_class_path,
49-
"#{controller_file_name}_spec.rb"
50-
)
5141
if options[:api]
52-
template 'api_request_spec.rb', template_file
42+
template 'api_request_spec.rb', template_file(folder: 'requests')
5343
else
54-
template 'request_spec.rb', template_file
44+
template 'request_spec.rb', template_file(folder: 'requests')
5545
end
5646
end
5747

@@ -130,6 +120,10 @@ def raw_value_for(attribute)
130120
end
131121
end
132122

123+
def template_file(folder:, suffix: '')
124+
File.join('spec', folder, controller_class_path, "#{controller_file_name}#{suffix}_spec.rb")
125+
end
126+
133127
def banner
134128
self.class.banner
135129
end

0 commit comments

Comments
 (0)