X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b617b766abd8df1ec72255f8bd436935a8b40fa..25256a484914ee40d829d9184fb4107dd0a77d44:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 0e06c3c9e..df88a6ee0 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,17 @@ 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 + + ## + # set oauth token permissions + def grant_oauth_token(*tokens) + request.env["oauth.token"] = AccessToken.new do |token| + tokens.each do |t| + token.public_send("#{t}=", true) + end + end end ##