diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-24 11:43:54 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-24 11:43:54 -0300 |
| commit | 9882f9e43cbaab9b173558338c931bd72baec470 (patch) | |
| tree | 8602b0ad9f2f2c268b8c4f098558c693d678d825 /railties/test | |
| parent | fee34594bed22b61831faacd84b8052929865836 (diff) | |
| parent | 46fedb478217a5bfbccd13ed87212e51f6e77469 (diff) | |
| download | rails-9882f9e43cbaab9b173558338c931bd72baec470.tar.gz rails-9882f9e43cbaab9b173558338c931bd72baec470.tar.bz2 rails-9882f9e43cbaab9b173558338c931bd72baec470.zip | |
Merge pull request #20265 from benpickles/gitignore-keeps
Omit .keep in .gitignore when generated with --skip-keeps.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 3bcf3894ce..3a2195035f 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -138,7 +138,11 @@ module SharedGeneratorTests def test_skip_keeps run_generator [destination_root, '--skip-keeps', '--full'] - assert_file('.gitignore') + + assert_file '.gitignore' do |content| + assert_no_match(/\.keep/, content) + end + assert_no_file('app/mailers/.keep') end end |