aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2011-12-09 21:25:02 -0800
committerYehuda Katz <wycats@gmail.com>2011-12-09 21:25:02 -0800
commitaace38ae09e7a9495d8ab8e73c69a3c14fdbdabd (patch)
tree0d15c12b84a80a144884df58ec64f72012c72d9a /railties/test
parent7fc0964133d348d7e2d538453dd30bdd769a1827 (diff)
parent55afc7dc609b6b2b7f7ce37537c0de5e4db8ca6b (diff)
downloadrails-aace38ae09e7a9495d8ab8e73c69a3c14fdbdabd.tar.gz
rails-aace38ae09e7a9495d8ab8e73c69a3c14fdbdabd.tar.bz2
rails-aace38ae09e7a9495d8ab8e73c69a3c14fdbdabd.zip
Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhino
Add test to verify that therubyrhino isn't included when JRuby isn't used
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 0e2990affd..4c22e7a3ce 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -215,9 +215,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
def test_inclusion_of_therubyrhino_under_jruby
+ run_generator([destination_root])
if defined?(JRUBY_VERSION)
- run_generator([destination_root])
assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
+ else
+ assert_file "Gemfile" do |content|
+ assert_no_match(/gem\s+["']therubyrhino["']$/, content)
+ end
end
end