diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /spec/support/helpers | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/support/helpers')
-rw-r--r-- | spec/support/helpers/api_helpers.rb | 11 | ||||
-rw-r--r-- | spec/support/helpers/migrations_helpers.rb | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/spec/support/helpers/api_helpers.rb b/spec/support/helpers/api_helpers.rb index b1e6078c4f2..eb9594a4fb6 100644 --- a/spec/support/helpers/api_helpers.rb +++ b/spec/support/helpers/api_helpers.rb @@ -40,6 +40,17 @@ module ApiHelpers end end + def basic_auth_header(user = nil) + return { 'HTTP_AUTHORIZATION' => user } unless user.respond_to?(:username) + + { + 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials( + user.username, + create(:personal_access_token, user: user).token + ) + } + end + def expect_empty_array_response expect_successful_response_with_paginated_array expect(json_response.length).to eq(0) diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb index 5eb70f534d8..2c31a608b35 100644 --- a/spec/support/helpers/migrations_helpers.rb +++ b/spec/support/helpers/migrations_helpers.rb @@ -80,6 +80,9 @@ module MigrationsHelpers allow(ActiveRecord::Base.connection) .to receive(:active?) .and_return(false) + allow(Gitlab::Runtime) + .to receive(:rake?) + .and_return(true) stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') end |