kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile

Browse source 
Added therubyrhino to default Gemfile under JRuby
This commit is contained in:
José Valim 2011-11-14 09:53:57 -08:00
commit 2088f1b3b4
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
railties/lib/rails/generators/app_base.rb
View file

@ -199,6 +199,7 @@ module Rails
group :assets do group :assets do
gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git' gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git'
gem 'coffee-rails', :git => 'git://github.com/rails/coffee-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' gem 'uglifier', '>= 1.0.3'
end end
GEMFILE GEMFILE

7
railties/test/generators/app_generator_test.rb
View file

@ -208,6 +208,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_file "test/performance/browsing_test.rb" assert_file "test/performance/browsing_test.rb"
end 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 def test_creation_of_a_test_directory
run_generator run_generator
assert_file 'test' assert_file 'test'