Commit 25fa78e2 authored by Mike Greiling's avatar Mike Greiling

Backport line changes from EE

EE-specific line changes were introduced in the following MR:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12680

This change resolves most of them
parent 37973465
......@@ -18,6 +18,8 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
end
before do
stub_licensed_features(variable_environment_scope: true)
project.add_maintainer(admin)
sign_in(admin)
allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')
......
......@@ -130,7 +130,7 @@ module TestEnv
# Keeps gitlab-shell and gitlab-test
def clean_test_path
Dir[TMP_TEST_PATH].each do |entry|
unless File.basename(entry) =~ /\A(frontend|gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/
unless test_dirs.include?(File.basename(entry))
FileUtils.rm_rf(entry)
end
end
......@@ -316,6 +316,7 @@ module TestEnv
# These are directories that should be preserved at cleanup time
def test_dirs
@test_dirs ||= %w[
frontend
gitaly
gitlab-shell
gitlab-test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment