From d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Oct 2021 08:43:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-4-stable-ee --- spec/support/helpers/javascript_fixtures_helpers.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'spec/support/helpers/javascript_fixtures_helpers.rb') diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb index 5174c145a93..fb909008f12 100644 --- a/spec/support/helpers/javascript_fixtures_helpers.rb +++ b/spec/support/helpers/javascript_fixtures_helpers.rb @@ -3,6 +3,8 @@ require 'action_dispatch/testing/test_request' require 'fileutils' +require_relative '../../../lib/gitlab/popen' + module JavaScriptFixturesHelpers extend ActiveSupport::Concern include Gitlab::Popen @@ -25,17 +27,6 @@ module JavaScriptFixturesHelpers 'tmp/tests/frontend/fixtures' + (Gitlab.ee? ? '-ee' : '') end - # Public: Removes all fixture files from given directory - # - # directory_name - directory of the fixtures (relative to .fixture_root_path) - # - def clean_frontend_fixtures(directory_name) - full_directory_name = File.expand_path(directory_name, fixture_root_path) - Dir[File.expand_path('*.{html,json,md}', full_directory_name)].each do |file_name| - FileUtils.rm(file_name) - end - end - def remove_repository(project) Gitlab::Shell.new.remove_repository(project.repository_storage, project.disk_path) end -- cgit v1.2.3