Merge pull request rails#1719 from ryanb/fix_generated_engine_javascript

Fix generated JavaScript for mountable engine in 3-1-stable

railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

@@ -118,7 +118,7 @@ def javascripts
       return if options.skip_javascript?
 
       if mountable?
-        copy_file "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
+        template "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
                   "app/assets/javascripts/#{name}/application.js"
       elsif full?
         empty_directory_with_gitkeep "app/assets/javascripts/#{name}"

railties/lib/rails/generators/rails/plugin_new/templates/Gemfile

@@ -6,6 +6,10 @@ source "http://rubygems.org"
 <%= database_gemfile_entry -%>
 <% end -%>
 
+<% if mountable? -%>
+<%= gem_for_javascript -%>
+<% end -%>
+
 if RUBY_VERSION < '1.9'
   gem "ruby-debug", ">= 0.10.3"
 end

railties/test/generators/plugin_new_generator_test.rb

@@ -112,6 +112,28 @@ def test_javascripts_generation
     assert_file "app/assets/javascripts/bukkits/application.js"
   end
 
+  def test_jquery_is_the_default_javascript_library
+    run_generator [destination_root, "--mountable"]
+    assert_file "app/assets/javascripts/bukkits/application.js" do |contents|
+      assert_match %r{^//= require jquery}, contents
+      assert_match %r{^//= require jquery_ujs}, contents
+    end
+    assert_file 'Gemfile' do |contents|
+      assert_match(/^gem 'jquery-rails'/, contents)
+    end
+  end
+
+  def test_other_javascript_libraries
+    run_generator [destination_root, "--mountable", '-j', 'prototype']
+    assert_file "app/assets/javascripts/bukkits/application.js" do |contents|
+      assert_match %r{^//= require prototype}, contents
+      assert_match %r{^//= require prototype_ujs}, contents
+    end
+    assert_file 'Gemfile' do |contents|
+      assert_match(/^gem 'prototype-rails'/, contents)
+    end
+  end
+
   def test_skip_javascripts
     run_generator [destination_root, "--skip-javascript", "--mountable"]
     assert_no_file "app/assets/javascripts/bukkits/application.js"