Permalink
Browse files

3-1-stable fix test when running Jruby. If Jruby Platform is availabl…

…e the gem will change.
  • Loading branch information...
1 parent 0b794f9 commit df5971d09374c3c9b89d55af407670838e54ac19 @raysrashmi raysrashmi committed Jun 29, 2011
Showing with 10 additions and 2 deletions.
  1. +10 −2 railties/test/generators/app_generator_test.rb
@@ -124,13 +124,21 @@ def test_application_names_are_not_singularized
def test_config_database_is_added_by_default
run_generator
assert_file "config/database.yml", /sqlite3/
- assert_file "Gemfile", /^gem\s+["']sqlite3["']$/
+ unless defined?(JRUBY_VERSION)
+ assert_file "Gemfile", /^gem\s+["']sqlite3["']$/
+ else
+ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/
+ end
end
def test_config_another_database
run_generator([destination_root, "-d", "mysql"])
assert_file "config/database.yml", /mysql/
- assert_file "Gemfile", /^gem\s+["']mysql2["']$/
+ unless defined?(JRUBY_VERSION)
+ assert_file "Gemfile", /^gem\s+["']mysql2["']$/
+ else
+ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
+ end
end
def test_config_jdbcmysql_database

0 comments on commit df5971d

Please sign in to comment.