X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b617b766abd8df1ec72255f8bd436935a8b40fa..0071025400589cdf0320466609bdbb6ed27e1fb4:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0e06c3c9e..7198519a7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,14 +2,13 @@ require "coveralls"
 Coveralls.wear!("rails")
 
 ENV["RAILS_ENV"] = "test"
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path("../config/environment", __dir__)
 require "rails/test_help"
 require "webmock/minitest"
-require "minitest/rails/capybara"
 
 module ActiveSupport
   class TestCase
-    include FactoryGirl::Syntax::Methods
+    include FactoryBot::Syntax::Methods
 
     ##
     # takes a block which is executed in the context of a different
@@ -83,7 +82,7 @@ module ActiveSupport
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)
-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
+      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))
     end
 
     ##