diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-01-18 14:54:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 14:54:13 -0500 |
| commit | 7df7780e40b08ebc27b9a9650148e93f144ab1e6 (patch) | |
| tree | 4a2863fa2ff7a7b6b8d053dc144c0ccbf6c5084a /railties | |
| parent | e0ad907ade3bca1c57a32c1987c4080305019845 (diff) | |
| parent | a2aa18f897dbcd503ed3b782258a44b21ca752bd (diff) | |
| download | rails-7df7780e40b08ebc27b9a9650148e93f144ab1e6.tar.gz rails-7df7780e40b08ebc27b9a9650148e93f144ab1e6.tar.bz2 rails-7df7780e40b08ebc27b9a9650148e93f144ab1e6.zip | |
Merge pull request #31730 from bogdanvlviv/allow_false_for-config-generators-system_tests
Allow `false` for `config.generators.system_tests=`
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index b6c13b41ae..e2e8b18eab 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -23,7 +23,7 @@ module TestUnit # :nodoc: template template_file, File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb") - unless options.api? || options[:system_tests].nil? + if !options.api? && options[:system_tests] template "system_test.rb", File.join("test/system", class_path, "#{file_name.pluralize}_test.rb") end end |