diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /spec/support/helpers/javascript_fixtures_helpers.rb | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'spec/support/helpers/javascript_fixtures_helpers.rb')
-rw-r--r-- | spec/support/helpers/javascript_fixtures_helpers.rb | 13 |
1 files changed, 2 insertions, 11 deletions
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 |