Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix test when running Jruby. If Jruby Platform is available the gem w…
…ill change.
  • Loading branch information
arunagw committed Jun 28, 2011
1 parent 941d5c1 commit 2b046e7
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions railties/test/generators/app_generator_test.rb
Expand Up @@ -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
Expand Down

0 comments on commit 2b046e7

Please sign in to comment.