diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-22 05:02:52 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-22 05:02:52 -0700 |
| commit | 53444b861c6e12ce77d6dfa2cd3031979c2d83fa (patch) | |
| tree | 8839d79081543155db25dbb6a0892048501d1502 | |
| parent | 3c8c37984865221bdb6e1ed0a04a30d2785a3b85 (diff) | |
| parent | 3534ea8d50638c32b8e7fb46d1d3767912f7b480 (diff) | |
| download | rails-53444b861c6e12ce77d6dfa2cd3031979c2d83fa.tar.gz rails-53444b861c6e12ce77d6dfa2cd3031979c2d83fa.tar.bz2 rails-53444b861c6e12ce77d6dfa2cd3031979c2d83fa.zip | |
Merge pull request #1813 from arunagw/jruby_tests
Tests Added for jdbc option added for Jruby
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index c31c65a27d..03d185165f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -134,7 +134,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_config_jdbcmysql_database run_generator([destination_root, "-d", "jdbcmysql"]) - assert_file "config/database.yml", /jdbcmysql/ + assert_file "config/database.yml", /mysql/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/ # TODO: When the JRuby guys merge jruby-openssl in # jruby this will be removed @@ -143,16 +143,31 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_config_jdbcsqlite3_database run_generator([destination_root, "-d", "jdbcsqlite3"]) - assert_file "config/database.yml", /jdbcsqlite3/ + assert_file "config/database.yml", /sqlite3/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/ end def test_config_jdbcpostgresql_database run_generator([destination_root, "-d", "jdbcpostgresql"]) - assert_file "config/database.yml", /jdbcpostgresql/ + assert_file "config/database.yml", /postgresql/ assert_file "Gemfile", /^gem\s+["']activerecord-jdbcpostgresql-adapter["']$/ end + def test_config_jdbc_database + run_generator([destination_root, "-d", "jdbc"]) + assert_file "config/database.yml", /jdbc/ + assert_file "config/database.yml", /mssql/ + assert_file "Gemfile", /^gem\s+["']activerecord-jdbc-adapter["']$/ + end + + def test_config_jdbc_database_when_no_option_given + if defined?(JRUBY_VERSION) + run_generator([destination_root]) + assert_file "config/database.yml", /sqlite3/ + assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/ + end + end + def test_generator_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] assert_no_file "config/database.yml" |