aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-04-17 15:33:15 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-06-11 16:54:11 -0300
commit7b47e4250df86f6ecf509b2ae1a151762676c4ed (patch)
treeb99d6f9dd485dcff9e70eeb53c1b870594e6eac2
parent3847e485b6feddf1bcfdb856238f0bd096001193 (diff)
downloadrails-7b47e4250df86f6ecf509b2ae1a151762676c4ed.tar.gz
rails-7b47e4250df86f6ecf509b2ae1a151762676c4ed.tar.bz2
rails-7b47e4250df86f6ecf509b2ae1a151762676c4ed.zip
Do not generate test/helpers directory for api apps
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb1
-rw-r--r--railties/test/generators/api_app_generator_test.rb1
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 e7543d7bbf..bd096d3c16 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -268,6 +268,7 @@ module Rails
def delete_app_helpers_if_api_option
if options[:api]
remove_dir 'app/helpers'
+ remove_dir 'test/helpers'
end
end
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index d19034cf4a..3eb9815b75 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -81,6 +81,7 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
config/initializers/cookies_serializer.rb
config/initializers/session_store.rb
vendor/assets
+ test/helpers
tmp/cache/assets)
end
end