From 46fedb478217a5bfbccd13ed87212e51f6e77469 Mon Sep 17 00:00:00 2001 From: Ben Pickles Date: Fri, 22 May 2015 13:24:48 +0100 Subject: Omit .keep in .gitignore when generated with --skip-keeps. --- railties/test/generators/shared_generator_tests.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'railties/test') 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 -- cgit v1.2.3