diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-10-21 09:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 09:15:20 -0500 |
| commit | a08ef99d5f74301e027feb727c680b3a1fda44b2 (patch) | |
| tree | fbd3abceb3795c1d02eef9ea761cedf2647a37cb | |
| parent | f2c6db41ba56afb1529e4732c59622fc0cf9f3ba (diff) | |
| parent | 1b7263143a91f87faabde3a5d10c74308876f640 (diff) | |
| download | rails-a08ef99d5f74301e027feb727c680b3a1fda44b2.tar.gz rails-a08ef99d5f74301e027feb727c680b3a1fda44b2.tar.bz2 rails-a08ef99d5f74301e027feb727c680b3a1fda44b2.zip | |
Merge pull request #26853 from zegomesjf/feature/skip_active_record
don't create db directory when skip active_record
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 9f9c50ca10..03573b274d 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -241,6 +241,7 @@ module Rails end def create_db_files + return if options[:skip_active_record] build(:db) end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 8f7fa1155f..830e49a1b5 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -356,6 +356,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] + assert_no_directory "db/" assert_no_file "config/database.yml" assert_no_file "app/models/application_record.rb" assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ |