diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-13 06:25:43 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-13 12:40:10 -0200 |
| commit | 70631e723ca9503b387f25076b9fb7f68726f81e (patch) | |
| tree | 8904169d2683b1d79b42666367d153c987eaccaf /railties/test/generators | |
| parent | 05367e656f0b5c5d5bb3c4676c81fdd064b1cd02 (diff) | |
| download | rails-70631e723ca9503b387f25076b9fb7f68726f81e.tar.gz rails-70631e723ca9503b387f25076b9fb7f68726f81e.tar.bz2 rails-70631e723ca9503b387f25076b9fb7f68726f81e.zip | |
Merge pull request #4451 from guilleiguaran/add-therubyracer-commented
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index c456347e5c..a4589c49f4 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -230,14 +230,12 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "test/performance/browsing_test.rb" end - def test_inclusion_of_therubyrhino_under_jruby + def test_inclusion_of_javascript_runtime 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 + assert_file "Gemfile", /# gem\s+["']therubyracer["']$/ end end |