Commit 99d3839f authored by Miguel Rincon's avatar Miguel Rincon

Merge branch...

Merge branch '342022-running-foss-and-ee-frontend-fixtures-for-the-same-folder-can-lead-to-missing-fixtures' into 'master'

Don't cleanup frontend fixtures before generating them

See merge request gitlab-org/gitlab!71479
parents 151256ed 79b27c02
......@@ -29,11 +29,9 @@ module JavaScriptFixturesHelpers
#
# directory_name - directory of the fixtures (relative to .fixture_root_path)
#
# TODO: Make sure this isn't called anymore.
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
# We don't really need to cleanup fixtures, as this can be a problem when FOSS & EE fixtures try to generate files in the same folder.
end
def remove_repository(project)
......
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