diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-07-18 15:03:48 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-07-19 02:27:13 -0500 |
| commit | 25fa78e2f9205427274772ff620d59cc9162400c (patch) | |
| tree | 151583f602f5709bb901bb4c5dbf89e02f6c0ea4 | |
| parent | 37973465f5be9ef92d3186f5bbb9823619b1b4a2 (diff) | |
| download | gitlab-ce-25fa78e2f9205427274772ff620d59cc9162400c.tar.gz | |
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
| -rw-r--r-- | spec/javascripts/fixtures/projects.rb | 2 | ||||
| -rw-r--r-- | spec/support/helpers/test_env.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/projects.rb b/spec/javascripts/fixtures/projects.rb index 91e3b65215a..b6c29003e57 100644 --- a/spec/javascripts/fixtures/projects.rb +++ b/spec/javascripts/fixtures/projects.rb @@ -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') diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 71f86a4102d..b062631b995 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -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 |