kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Adds application.js when app is generated with -J and clear javascript_expansions[:defaults]

Browse source
This commit is contained in:
Santiago Pastorino 2010-07-16 22:53:37 +08:00 committed by Aaron Patterson
parent ea7f1fb026
commit 114fa4d431
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -115,6 +115,7 @@ module Rails
directory "public/javascripts"
else
empty_directory_with_gitkeep "public/javascripts"
create_file "public/javascripts/application.js"
end
end

4
railties/lib/rails/generators/rails/app/templates/config/application.rb
View file

@ -40,7 +40,11 @@ module <%= app_const_base %>
# config.i18n.default_locale = :de
# Add your default javascripts
<% if options[:skip_prototype] -%>
config.action_view.javascript_expansions[:defaults] = []
<% else -%>
# config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
<% end -%>
# Configure generators values. Many other options are available, be sure to check the documentation.
# config.generators do |g|

7
railties/test/generators/app_generator_test.rb
View file

@ -129,14 +129,19 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_prototype_and_test_unit_are_added_by_default
run_generator
assert_file "config/application.rb", /#\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+%w\(jquery rails\)/
assert_file "public/javascripts/application.js"
assert_file "public/javascripts/prototype.js"
assert_file "public/javascripts/rails.js"
assert_file "test"
end
def test_prototype_and_test_unit_are_skipped_if_required
run_generator [destination_root, "--skip-prototype", "--skip-testunit"]
assert_file "config/application.rb", /^\s+config\.action_view\.javascript_expansions\[:defaults\]\s+=\s+\[\]/
assert_file "public/javascripts/application.js"
assert_no_file "public/javascripts/prototype.js"
assert_file "public/javascripts"
assert_no_file "public/javascripts/rails.js"
assert_no_file "test"
end