diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-10 17:23:30 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-10 17:23:30 +0100 |
| commit | 437a7a406c408f106a6ae5d89a5d012106a74e39 (patch) | |
| tree | 98566250c3afaf73ace317533c04dcdfad96eeac /railties/lib/rails/generators | |
| parent | 31778a34a8c6e1d186c1e807491c1f44c5f07357 (diff) | |
| parent | 00c64e8ae2c312139e5a242331d3919fe139b87c (diff) | |
| download | rails-437a7a406c408f106a6ae5d89a5d012106a74e39.tar.gz rails-437a7a406c408f106a6ae5d89a5d012106a74e39.tar.bz2 rails-437a7a406c408f106a6ae5d89a5d012106a74e39.zip | |
Merge pull request #23512 from y-yagi/set_association_name_to_fixture
set association name to generated fixtures if attribute is reference
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/fixtures.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml index 2656767eb4..0681780c97 100644 --- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml +++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml @@ -6,7 +6,7 @@ <%- if attribute.password_digest? -%> password_digest: <%%= BCrypt::Password.create('secret') %> <%- elsif attribute.reference? -%> - <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default) %> + <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default || name) %> <%- else -%> <%= yaml_key_value(attribute.column_name, attribute.default) %> <%- end -%> |