diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-01-14 21:03:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 21:03:53 +0100 |
commit | 54d4a518d9a8079c9bc03bee454e966e93036942 (patch) | |
tree | ac44003e7cf1b3cb3fdcb3f648d32172bb2cbb8f /railties/test/application/multiple_applications_test.rb | |
parent | 2585e66b551a8b368425aad062e5f325985ab482 (diff) | |
parent | 37c948ce6715df8ecbcda2b64a1e6eee9c5d6bb6 (diff) | |
download | rails-54d4a518d9a8079c9bc03bee454e966e93036942.tar.gz rails-54d4a518d9a8079c9bc03bee454e966e93036942.tar.bz2 rails-54d4a518d9a8079c9bc03bee454e966e93036942.zip |
Merge pull request #33962 from kaspth/restructure-environment-credentials
Restructure credentials after environment overrides.
Diffstat (limited to 'railties/test/application/multiple_applications_test.rb')
-rw-r--r-- | railties/test/application/multiple_applications_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb index d6c81c1fe2..432344bccc 100644 --- a/railties/test/application/multiple_applications_test.rb +++ b/railties/test/application/multiple_applications_test.rb @@ -165,12 +165,12 @@ module ApplicationTests app.config.some_setting = "a_different_setting" assert_equal "a_different_setting", app.config.some_setting, "The configuration's some_setting should be set." - new_config = Rails::Application::Configuration.new("root_of_application") + new_config = Rails::Application::Configuration.new(Pathname.new("root_of_application")) new_config.some_setting = "some_setting_dude" app.config = new_config assert_equal "some_setting_dude", app.config.some_setting, "The configuration's some_setting should have changed." - assert_equal "root_of_application", app.config.root, "The root should have changed to the new config's root." + assert_equal "root_of_application", app.config.root.to_s, "The root should have changed to the new config's root." assert_equal new_config, app.config, "The application's config should have changed to the new config." end end |