diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-11-01 15:10:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-01 15:10:24 -0400 |
commit | 7bb28a0df2c5e31224e094243580a37ca43ccead (patch) | |
tree | 7262a3480456fbebca931d65adad312819b5c749 /railties/test | |
parent | 4e8f1ba242382c4f5535571bbc19d8efbcfbd7d5 (diff) | |
parent | de08be6af68373f6387854960ac967611d69ec9f (diff) | |
download | rails-7bb28a0df2c5e31224e094243580a37ca43ccead.tar.gz rails-7bb28a0df2c5e31224e094243580a37ca43ccead.tar.bz2 rails-7bb28a0df2c5e31224e094243580a37ca43ccead.zip |
Merge pull request #26950 from bouk/exclude-dbmigrate
Don't put db:migrate and db:setup in binfiles if activerecord is excluded
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 9299b9ebea..6c6c5613ab 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -363,6 +363,12 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "test/test_helper.rb" do |helper_content| assert_no_match(/fixtures :all/, helper_content) end + assert_file "bin/setup" do |setup_content| + assert_no_match(/db:setup/, setup_content) + end + assert_file "bin/update" do |update_content| + assert_no_match(/db:migrate/, update_content) + end assert_file "config/initializers/new_framework_defaults.rb" do |initializer_content| assert_no_match(/belongs_to_required_by_default/, initializer_content) |