Skip to content

Commit

Permalink
Merge pull request #32674 from composerinteralia/relax-assertion
Browse files Browse the repository at this point in the history
Relax assertions in connection config tests
  • Loading branch information
kamipo committed Apr 21, 2018
2 parents f6e3ca5 + c03c519 commit eb2f2fc
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_establish_connection_using_3_level_config_defaults_to_default_env_prima

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
Expand All @@ -112,7 +112,7 @@ def test_establish_connection_using_2_level_config_defaults_to_default_env_prima

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
Expand Down

0 comments on commit eb2f2fc

Please sign in to comment.