aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-02-10 17:23:30 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-02-10 17:23:30 +0100
commit437a7a406c408f106a6ae5d89a5d012106a74e39 (patch)
tree98566250c3afaf73ace317533c04dcdfad96eeac /railties/test/application
parent31778a34a8c6e1d186c1e807491c1f44c5f07357 (diff)
parent00c64e8ae2c312139e5a242331d3919fe139b87c (diff)
downloadrails-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/test/application')
-rw-r--r--railties/test/application/rake_test.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 745a3e3ec5..3d3e47de8d 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -291,12 +291,11 @@ module ApplicationTests
assert_no_match(/Errors running/, output)
end
- def test_scaffold_with_references_columns_tests_pass_when_belongs_to_is_optional
- app_file "config/initializers/active_record_belongs_to_required_by_default.rb",
- "Rails.application.config.active_record.belongs_to_required_by_default = false"
-
+ def test_scaffold_with_references_columns_tests_pass_by_default
output = Dir.chdir(app_path) do
- `bin/rails generate scaffold LineItems product:references cart:belongs_to;
+ `bin/rails generate model Product;
+ bin/rails generate model Cart;
+ bin/rails generate scaffold LineItems product:references cart:belongs_to;
RAILS_ENV=test bin/rails db:migrate test`
end