From cf70549c11d045560799b7a5ed71d09de8a67858 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 8 Oct 2010 15:17:41 +0530 Subject: [PATCH 1/2] fix to ensure fixtures file does not get created --- .../rails/generators/rails/app/app_generator.rb | 10 +++++++++- railties/test/generators/app_generator_test.rb | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 7907191..36b7ac3 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -124,7 +124,15 @@ module Rails end def test - directory "test" + empty_directory "test" + + inside "test" do + template "test_helper.rb.tt", "test_helper.rb" + directory "fixtures" unless @options[:skip_active_record] + %w(functional integration unit performance).each do |dir| + directory(dir) + end + end end def tmp diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3653b06..5e42e8e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -170,6 +170,14 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "config/database.yml" end + def test_fixtures_are_not_created_if_skip_active_record_is_given + run_generator [destination_root, "--skip-active-record"] + assert_no_file "test/fixtures" + assert_file "test/test_helper.rb" do |helper_file| + assert_no_match /fixtures :all/, helper_file + end + end + def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ -- 1.7.1 From c8a4ff8a304bc4e4403b3794ff453ce745173cbc Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Fri, 8 Oct 2010 15:30:20 +0530 Subject: [PATCH 2/2] remove empty directories which are now being created programmatically --- .../rails/generators/rails/app/app_generator.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 36b7ac3..60b8873 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -128,9 +128,9 @@ module Rails inside "test" do template "test_helper.rb.tt", "test_helper.rb" - directory "fixtures" unless @options[:skip_active_record] + empty_directory_with_gitkeep "fixtures" unless @options[:skip_active_record] %w(functional integration unit performance).each do |dir| - directory(dir) + empty_directory_with_gitkeep(dir) end end end diff --git a/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory deleted file mode 100644 index e69de29..0000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory deleted file mode 100644 index e69de29..0000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory deleted file mode 100644 index e69de29..0000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory deleted file mode 100644 index e69de29..0000000 -- 1.7.1