Permalink
Browse files

Merge pull request #3705 from guilleiguaran/3-1-stable-therubyrhino

Added therubyrhino to default Gemfile under JRuby
  • Loading branch information...
2 parents e568c67 + 80b1d4d commit d06c3b3cd22c7a24a5c8f1de866272837b665bc8 @josevalim josevalim committed Dec 10, 2011
View
13 railties/CHANGELOG.md
@@ -1,8 +1,16 @@
-## Rails 3.1.3 (unreleased) ##
+## Rails 3.1.4 (unreleased) ##
+
+* Add therubyrhino to Gemfile in new applications when running under JRuby.
+
+ *Guillermo Iguaran*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
* New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
-## Rails 3.1.2 (unreleased) ##
+
+## Rails 3.1.2 (November 18, 2011) ##
* Engines: don't blow up if db/seeds.rb is missing.
@@ -13,6 +21,7 @@
*José Valim*
+
## Rails 3.1.1 (October 7, 2011) ##
* Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
View
1 railties/lib/rails/generators/app_base.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
View
11 railties/test/generators/app_generator_test.rb
@@ -183,6 +183,17 @@ def test_generator_if_skip_sprockets_is_given
assert_file "test/performance/browsing_test.rb"
end
+ def test_inclusion_of_therubyrhino_under_jruby
+ run_generator([destination_root])
+ if defined?(JRUBY_VERSION)
+ assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
+ else
+ assert_file "Gemfile" do |content|
+ assert_no_match(/gem\s+["']therubyrhino["']$/, content)
+ end
+ end
+ end
+
def test_creation_of_a_test_directory
run_generator
assert_file 'test'

0 comments on commit d06c3b3

Please sign in to comment.