aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorArun Agrawal <arun@fromjaipur.com>2011-06-22 08:15:12 +0530
committerArun Agrawal <arun@fromjaipur.com>2011-06-22 08:15:12 +0530
commitb2a19ad90b9f542b7800e163c56943f48b97f822 (patch)
tree0d93aee8add3650cec27b15029c1b74113beb271 /railties/test/generators
parentb7bce739b1d57848c693c94b377fb56fccc74399 (diff)
downloadrails-b2a19ad90b9f542b7800e163c56943f48b97f822.tar.gz
rails-b2a19ad90b9f542b7800e163c56943f48b97f822.tar.bz2
rails-b2a19ad90b9f542b7800e163c56943f48b97f822.zip
Making tests according to the changes #jruby
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/app_generator_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 310d2782a9..92d5cd77dc 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,19 +143,20 @@ 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