diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-28 14:59:38 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-28 14:59:38 -0700 |
| commit | ff9566caf21f6f5106831e6b75fe9ec47c7d1629 (patch) | |
| tree | ccb70525e7aeebede79fc07968a10fc518a38122 | |
| parent | 59e38803e90a25adcaefdc051c5abcb170c33672 (diff) | |
| parent | 2b046e7c39da1350e13ae54a7f07cdfb4c62bba8 (diff) | |
| download | rails-ff9566caf21f6f5106831e6b75fe9ec47c7d1629.tar.gz rails-ff9566caf21f6f5106831e6b75fe9ec47c7d1629.tar.bz2 rails-ff9566caf21f6f5106831e6b75fe9ec47c7d1629.zip | |
Merge pull request #1886 from arunagw/fix_test_for_jruby_db
fix test when running Jruby. If Jruby Platform is available the gem will
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 86217f4ab9..eb60674a03 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -124,13 +124,21 @@ class AppGeneratorTest < Rails::Generators::TestCase 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 |