Added therubyrhino to default Gemfile under JRuby

guilleiguaran · Nov 14, 2011 · 49cd6a0 · 49cd6a0
1 parent df300a7
commit 49cd6a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
@@ -199,6 +199,7 @@ def assets_gemfile_entry
           group :assets do
             gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
             gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+            #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -208,6 +208,13 @@ def test_generator_if_skip_sprockets_is_given
     assert_file "test/performance/browsing_test.rb"
   end
 
+  def test_inclusion_of_therubyrhino_under_jruby
+    if defined?(JRUBY_VERSION)
+      run_generator([destination_root])
+      assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
+    end
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'