From 25fa78e2f9205427274772ff620d59cc9162400c Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 18 Jul 2019 15:03:48 -0500
Subject: 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
---
 spec/support/helpers/test_env.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'spec/support/helpers/test_env.rb')

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
-- 
cgit v1.2.1