diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-21 13:46:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-21 13:46:16 +0900 |
| commit | eb2f2fc2fc091f9c056206c8955aa69a642855ea (patch) | |
| tree | 0915e4abc0d139a721470d11211de6bcb2fa4761 /activerecord | |
| parent | f6e3ca515df97088315eef8905bf2bf3ec8ebbcc (diff) | |
| parent | c03c519db0f5bcbb9f1151db5774921ea9bd3a22 (diff) | |
| download | rails-eb2f2fc2fc091f9c056206c8955aa69a642855ea.tar.gz rails-eb2f2fc2fc091f9c056206c8955aa69a642855ea.tar.bz2 rails-eb2f2fc2fc091f9c056206c8955aa69a642855ea.zip | |
Merge pull request #32674 from composerinteralia/relax-assertion
Relax assertions in connection config tests
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/connection_adapters/connection_handler_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb index 57b3a5844e..b8e623f17b 100644 --- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb +++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb @@ -89,7 +89,7 @@ module ActiveRecord ActiveRecord::Base.establish_connection - assert_equal "db/primary.sqlite3", ActiveRecord::Base.connection.pool.spec.config[:database] + assert_match "db/primary.sqlite3", ActiveRecord::Base.connection.pool.spec.config[:database] ensure ActiveRecord::Base.configurations = @prev_configs ENV["RAILS_ENV"] = previous_env @@ -112,7 +112,7 @@ module ActiveRecord ActiveRecord::Base.establish_connection - assert_equal "db/primary.sqlite3", ActiveRecord::Base.connection.pool.spec.config[:database] + assert_match "db/primary.sqlite3", ActiveRecord::Base.connection.pool.spec.config[:database] ensure ActiveRecord::Base.configurations = @prev_configs ENV["RAILS_ENV"] = previous_env |