Merge branch 'master' into moderation

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0e06c3c9ef8bb8c1246051745656c0528aa81edf..95d48bd5c7f2ed0485173106b043378d61f98abe 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,11 +5,10 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 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
 
     ##