diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-13 06:25:43 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-13 06:25:43 -0800 |
| commit | 1e69181c5f4120d604fe86a9c2620694760d6c8e (patch) | |
| tree | b7608198fb618cbac7c0051bfd1d31290649d5ec /railties/test | |
| parent | daf59a73861bee7726a502c24a796c67e2ecd45f (diff) | |
| parent | 94bcdd60eaecd81e243731ac62af56b68f91b9fe (diff) | |
| download | rails-1e69181c5f4120d604fe86a9c2620694760d6c8e.tar.gz rails-1e69181c5f4120d604fe86a9c2620694760d6c8e.tar.bz2 rails-1e69181c5f4120d604fe86a9c2620694760d6c8e.zip | |
Merge pull request #4451 from guilleiguaran/add-therubyracer-commented
Add therubyracer gem commented in default Gemfile
Diffstat (limited to 'railties/test')
| -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 70ef37ee0f..f3071843e2 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -229,14 +229,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 |