Permalink
Browse files

Added therubyrhino to default Gemfile under JRuby

  • Loading branch information...
guilleiguaran committed Nov 14, 2011
1 parent e9474c8 commit b710ceacc23f7b9650e9b7763ecf9f85e94fd4b0
Showing with 8 additions and 0 deletions.
  1. +1 −0 railties/lib/rails/generators/app_base.rb
  2. +7 −0 railties/test/generators/app_generator_test.rb
@@ -211,6 +211,7 @@ def assets_gemfile_entry
group :assets do
gem 'sass-rails', #{options.dev? || options.edge? ? " :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : " '~> 3.1.5'"}
gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
+ #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
gem 'uglifier', '>= 1.0.3'
end
GEMFILE
@@ -183,6 +183,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'

0 comments on commit b710cea

Please sign in to comment.