diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-06-30 11:01:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 11:01:02 -0400 |
commit | 6671340d586d419107952a756039db0c258d095f (patch) | |
tree | 52027d0e907213723c37a00509711400afa49de1 /railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | |
parent | 5fe2a4f929fff7fa725545c47ac0f9372d8c643d (diff) | |
parent | d502cd1a5024743b3891592c73538d4e446bbd98 (diff) | |
download | rails-6671340d586d419107952a756039db0c258d095f.tar.gz rails-6671340d586d419107952a756039db0c258d095f.tar.bz2 rails-6671340d586d419107952a756039db0c258d095f.zip |
Merge pull request #29418 from dinahshi/scaffold_system_tests
Add system tests to generate scaffold
Diffstat (limited to 'railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb')
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index 12d6bc85b2..9522778c09 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -16,13 +16,10 @@ module Rails def handle_skip @options = @options.merge(stylesheets: false) unless options[:assets] @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet] - @options = @options.merge(system_tests: false) if options[:api] end hook_for :scaffold_controller, required: true - hook_for :system_tests, as: :system - hook_for :assets do |assets| invoke assets, [controller_name] end |