diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-11 04:44:39 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-11 04:44:39 -0800 |
| commit | c49fff93273ddcfdb8ee516e667123c328382be5 (patch) | |
| tree | cb50077af4569773857a070e665d44aa36642d71 /railties | |
| parent | 12d6d3a6f8914d272529d79cba461759e2dedf09 (diff) | |
| parent | 5ff5cce81a4c983d23dc4d7d992685d036e1c3c6 (diff) | |
| download | rails-c49fff93273ddcfdb8ee516e667123c328382be5.tar.gz rails-c49fff93273ddcfdb8ee516e667123c328382be5.tar.bz2 rails-c49fff93273ddcfdb8ee516e667123c328382be5.zip | |
Merge pull request #8170 from arunagw/warning_removed_railties
Removing warning : ambiguous first argument
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 528bec58ef..40d1655c9b 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -219,7 +219,7 @@ module ApplicationTests orig_rails_env, Rails.env = Rails.env, 'development' ActiveRecord::Base.establish_connection assert ActiveRecord::Base.connection - assert_match /#{ActiveRecord::Base.configurations[Rails.env]['database']}/, ActiveRecord::Base.connection_config[:database] + assert_match(/#{ActiveRecord::Base.configurations[Rails.env]['database']}/, ActiveRecord::Base.connection_config[:database]) ensure ActiveRecord::Base.remove_connection ENV["DATABASE_URL"] = orig_database_url if orig_database_url @@ -236,7 +236,7 @@ module ApplicationTests ENV["DATABASE_URL"] = "sqlite3://:@localhost/#{database_url_db_name}" ActiveRecord::Base.establish_connection assert ActiveRecord::Base.connection - assert_match /#{database_url_db_name}/, ActiveRecord::Base.connection_config[:database] + assert_match(/#{database_url_db_name}/, ActiveRecord::Base.connection_config[:database]) ensure ActiveRecord::Base.remove_connection ENV["DATABASE_URL"] = orig_database_url if orig_database_url |