Skip to content
This repository
Browse code

Added therubyrhino to default Gemfile under JRuby

  • Loading branch information...
commit b710ceacc23f7b9650e9b7763ecf9f85e94fd4b0 1 parent e9474c8
Guillermo Iguaran authored November 14, 2011
1  railties/lib/rails/generators/app_base.rb
@@ -211,6 +211,7 @@ def assets_gemfile_entry
211 211
           group :assets do
212 212
             gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.5'"}
213 213
             gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
  214
+            #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
214 215
             gem 'uglifier', '>= 1.0.3'
215 216
           end
216 217
         GEMFILE
7  railties/test/generators/app_generator_test.rb
@@ -183,6 +183,13 @@ def test_generator_if_skip_sprockets_is_given
183 183
     assert_file "test/performance/browsing_test.rb"
184 184
   end
185 185
 
  186
+  def test_inclusion_of_therubyrhino_under_jruby
  187
+    if defined?(JRUBY_VERSION)
  188
+      run_generator([destination_root])
  189
+      assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
  190
+    end
  191
+  end
  192
+
186 193
   def test_creation_of_a_test_directory
187 194
     run_generator
188 195
     assert_file 'test'

0 notes on commit b710cea

Please sign in to comment.
Something went wrong with that request. Please try again.