diff options
| author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2018-12-11 17:11:45 -0500 |
|---|---|---|
| committer | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2018-12-12 10:56:25 -0500 |
| commit | ea89b4588b829934ac9d2e8040ad7e87f398eb4a (patch) | |
| tree | ae4b9104443c7b6e9cc7d8f17f18070a34befc32 /railties/lib/rails/generators/test_unit/scaffold | |
| parent | 0fc6804c7e385140976520fd4d1a269eb735160b (diff) | |
| download | rails-ea89b4588b829934ac9d2e8040ad7e87f398eb4a.tar.gz rails-ea89b4588b829934ac9d2e8040ad7e87f398eb4a.tar.bz2 rails-ea89b4588b829934ac9d2e8040ad7e87f398eb4a.zip | |
Fix boolean interaction in scaffold system tests
Diffstat (limited to 'railties/lib/rails/generators/test_unit/scaffold')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt | 8 |
2 files changed, 13 insertions, 0 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 e2e8b18eab..662b5e206e 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -54,6 +54,11 @@ module TestUnit # :nodoc: end end.sort.to_h end + + def boolean?(name) + attribute = attributes.find { |attribute| attribute.name == name } + attribute&.type == :boolean + end end end end diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt b/railties/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt index 15bd7956b6..4f5bbf1108 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt +++ b/railties/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt @@ -16,8 +16,12 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase click_on "New <%= class_name.titleize %>" <%- attributes_hash.each do |attr, value| -%> + <%- if boolean?(attr) -%> + check "<%= attr.humanize %>" if <%= value %> + <%- else -%> fill_in "<%= attr.humanize %>", with: <%= value %> <%- end -%> + <%- end -%> click_on "Create <%= human_name %>" assert_text "<%= human_name %> was successfully created" @@ -29,8 +33,12 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase click_on "Edit", match: :first <%- attributes_hash.each do |attr, value| -%> + <%- if boolean?(attr) -%> + check "<%= attr.humanize %>" if <%= value %> + <%- else -%> fill_in "<%= attr.humanize %>", with: <%= value %> <%- end -%> + <%- end -%> click_on "Update <%= human_name %>" assert_text "<%= human_name %> was successfully updated" |