Respect ENV variables when finding DBs etc for the test suite

If they're not set we'll still fall back to localhost, but this makes it
possible to run the tests against a remote Postgres / Redis / whatever.

3 files changed, 15 insertions, 10 deletions

diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 84ac2f057e..5879949b61 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -93,6 +93,8 @@ module ApplicationTests
 
       def with_bad_permissions
         Dir.chdir(app_path) do
+          skip "Can't avoid permissions as root" if Process.uid.zero?
+
           set_database_url
           FileUtils.chmod("-w", "db")
           yield
diff --git a/railties/test/application/server_test.rb b/railties/test/application/server_test.rb
index f4bd09903a..5b8aab08d5 100644
--- a/railties/test/application/server_test.rb
+++ b/railties/test/application/server_test.rb
@@ -29,16 +29,18 @@ module ApplicationTests
       primary, replica = PTY.open
       pid = nil
 
-      begin
-        pid = Process.spawn("#{app_path}/bin/rails server -P tmp/dummy.pid", in: replica, out: replica, err: replica)
-        assert_output("Listening", primary)
-
-        rails("restart")
-
-        assert_output("Restarting", primary)
-        assert_output("Inherited", primary)
-      ensure
-        kill(pid) if pid
+      Bundler.with_original_env do
+        begin
+          pid = Process.spawn("bin/rails server -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica)
+          assert_output("Listening", primary)
+
+          rails("restart")
+
+          assert_output("Restarting", primary)
+          assert_output("Inherited", primary)
+        ensure
+          kill(pid) if pid
+        end
       end
     end
 
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index f22b9fda3d..6bcc0b0acb 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -19,6 +19,7 @@ module ApplicationTests
         config.session_store :cookie_store, key: "_myapp_session"
         config.active_support.deprecation = :log
         config.eager_load = false
+        config.hosts << proc { true }
       end
 
       Rails.application.initialize!