Add latest changes from gitlab-org/gitlab@12-10-stable-ee

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