Merge branch '342242-remove-calls-to-clean_frontend_fixtures' into 'master'

Remove the use of 'clean_frontend_fixtures'

See merge request gitlab-org/gitlab!71664

doc/development/testing_guide/frontend_testing.md

@@ -848,10 +848,6 @@ describe GraphQL::Query, type: :request do
 
   all_releases_query_path = 'releases/graphql/queries/all_releases.query.graphql'
 
-  before(:all) do
-    clean_frontend_fixtures('graphql/releases/')
-  end
-
   it "graphql/#{all_releases_query_path}.json" do
     query = get_graphql_query_as_string(all_releases_query_path)
 

ee/spec/frontend/fixtures/analytics/charts.rb

@@ -12,10 +12,6 @@
     freeze_time { example.run }
   end
 
-  before(:all) do
-    clean_frontend_fixtures('analytics/charts/')
-  end
-
   describe Groups::Analytics::TasksByTypeController, type: :controller do
     render_views
 

ee/spec/frontend/fixtures/analytics/devops_report/devops_adoption/enabled_namespaces.rb

@@ -37,7 +37,6 @@
     end
 
     before do
-      clean_frontend_fixtures('graphql/analytics/devops_report/devops_adoption/')
       stub_licensed_features(instance_level_devops_adoption: true, group_level_devops_adoption: true)
     end
 

ee/spec/frontend/fixtures/analytics/metrics.rb

@@ -29,10 +29,6 @@ def prepare_cycle_analytics_data
     freeze_time { example.run }
   end
 
-  before(:all) do
-    clean_frontend_fixtures('analytics/metrics')
-  end
-
   describe Groups::Analytics::CycleAnalytics::SummaryController, type: :controller do
     render_views
 

ee/spec/frontend/fixtures/api_markdown.rb

@@ -16,11 +16,7 @@
   let(:group_wiki_page) { create(:wiki_page, wiki: group_wiki) }
   let(:project_wiki_page) { create(:wiki_page, wiki: project_wiki) }
 
-  fixture_subdir = 'api/markdown'
-
   before(:all) do
-    clean_frontend_fixtures(fixture_subdir)
-
     group.add_owner(user)
   end
 
@@ -44,7 +40,7 @@
 
       name = "#{context}_#{name}" unless context.empty?
 
-      it "#{fixture_subdir}/#{name}.json" do
+      it "api/markdown/#{name}.json" do
         api_url = case context
                   when 'group_wiki'
                     "/groups/#{group.full_path}/-/wikis/#{group_wiki_page.slug}/preview_markdown"

ee/spec/frontend/fixtures/dora/metrics.rb

@@ -44,10 +44,6 @@
       }
     end
 
-    before(:all) do
-      clean_frontend_fixtures('api/dora/metrics')
-    end
-
     def make_request(additional_query_params:)
       params = shared_params.merge(additional_query_params)
       get api("/projects/#{project.id}/dora/metrics?#{params.to_query}", reporter)

ee/spec/frontend/fixtures/epic.rb

@@ -34,10 +34,6 @@
     ]
   end
 
-  before(:all) do
-    clean_frontend_fixtures('epic/')
-  end
-
   describe EpicPresenter, '(JavaScript fixtures)', type: :presenter do
     let(:response) { @json_data.to_json }
 

ee/spec/frontend/fixtures/merge_requests.rb

@@ -11,10 +11,6 @@
 
   render_views
 
-  before(:all) do
-    clean_frontend_fixtures('ee/merge_requests/')
-  end
-
   before do
     sign_in(user)
   end

ee/spec/frontend/fixtures/saml_providers.rb

@@ -9,10 +9,6 @@
 
   render_views
 
-  before(:all) do
-    clean_frontend_fixtures('groups/saml_providers/')
-  end
-
   before do
     sign_in(user)
     group.add_owner(user)

ee/spec/frontend/fixtures/search.rb

@@ -9,10 +9,6 @@
 
   let_it_be(:user) { create(:admin) }
 
-  before(:all) do
-    clean_frontend_fixtures('ee/search/')
-  end
-
   before do
     sign_in(user)
   end

lib/tasks/frontend.rake

 # frozen_string_literal: true
-require 'yaml'
 
 unless Rails.env.production?
   namespace :frontend do
     desc 'GitLab | Frontend | Generate fixtures for JavaScript tests'
     RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args|
+      require 'fileutils'
+      require_relative '../../spec/support/helpers/javascript_fixtures_helpers'
+
+      FileUtils.rm_r(JavaScriptFixturesHelpers.fixture_root_path, force: true)
+
       directories = %w[spec]
       directories << 'ee/spec' if Gitlab.ee?
       directory_glob = "{#{directories.join(',')}}"
@@ -16,6 +20,8 @@ unless Rails.env.production?
 
     desc 'GitLab | Frontend | Generate fixtures for JavaScript integration tests'
     RSpec::Core::RakeTask.new(:mock_server_rspec_fixtures) do |t, args|
+      require 'yaml'
+
       base_path = Pathname.new('spec/frontend_integration/fixture_generators.yml')
       ee_path = Pathname.new('ee') + base_path
 

spec/frontend/fixtures/abuse_reports.rb

@@ -13,10 +13,6 @@
 
   render_views
 
-  before(:all) do
-    clean_frontend_fixtures('abuse_reports/')
-  end
-
   before do
     sign_in(admin)
     enable_admin_mode!(admin)

spec/frontend/fixtures/admin_users.rb

@@ -17,10 +17,6 @@
 
   render_views
 
-  before(:all) do
-    clean_frontend_fixtures('admin/users')
-  end
-
   it 'admin/users/new_with_internal_user_regex.html' do
     stub_application_setting(user_default_external: true)
     stub_application_setting(user_default_internal_regex: '^(?:(?!\.ext@).)*$\r?')

spec/frontend/fixtures/analytics.rb

@@ -6,10 +6,6 @@
 
   let_it_be(:value_stream_id) { 'default' }
 
-  before(:all) do
-    clean_frontend_fixtures('projects/analytics/value_stream_analytics/')
-  end
-
   before do
     update_metrics
     create_deployment

spec/frontend/fixtures/api_markdown.rb

@@ -21,11 +21,7 @@
 
   let(:project_wiki_page) { create(:wiki_page, wiki: project_wiki) }
 
-  fixture_subdir = 'api/markdown'
-
   before(:all) do
-    clean_frontend_fixtures(fixture_subdir)
-
     group.add_owner(user)
     project.add_maintainer(user)
   end
@@ -49,7 +45,7 @@
 
       name = "#{context}_#{name}" unless context.empty?
 
-      it "#{fixture_subdir}/#{name}.json" do
+      it "api/markdown/#{name}.json" do
         api_url = case context
                   when 'project'
                     "/#{project.full_path}/preview_markdown"

spec/frontend/fixtures/api_merge_requests.rb

@@ -11,10 +11,6 @@
   let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') }
   let_it_be(:mr) { create(:merge_request, source_project: project) }
 
-  before(:all) do
-    clean_frontend_fixtures('api/merge_requests')
-  end
-
   it 'api/merge_requests/get.json' do
     4.times { |i| create(:merge_request, source_project: project, source_branch: "branch-#{i}") }
 

spec/frontend/fixtures/api_projects.rb

@@ -11,10 +11,6 @@
   let(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') }
   let(:project_empty) { create(:project_empty_repo, namespace: namespace, path: 'lorem-ipsum-empty') }
 
-  before(:all) do
-    clean_frontend_fixtures('api/projects')
-  end
-
   it 'api/projects/get.json' do
     get api("/projects/#{project.id}", admin)
 

spec/frontend/fixtures/application_settings.rb

@@ -19,10 +19,6 @@
 
   render_views
 
-  before(:all) do
-    clean_frontend_fixtures('application_settings/')
-  end
-
   after do
     remove_repository(project)
   end

spec/frontend/fixtures/autocomplete.rb

@@ -11,10 +11,6 @@
   let(:project) { create(:project, namespace: group, path: 'autocomplete-project') }
   let(:merge_request) { create(:merge_request, source_project: project, author: user) }
 
-  before(:all) do
-    clean_frontend_fixtures('autocomplete/')
-  end
-
   before do
     group.add_owner(user)
     sign_in(user)

spec/frontend/fixtures/autocomplete_sources.rb

@@ -10,10 +10,6 @@
   let_it_be(:project) { create(:project, namespace: group, path: 'autocomplete-sources-project') }
   let_it_be(:issue) { create(:issue, project: project) }
 
-  before(:all) do
-    clean_frontend_fixtures('autocomplete_sources/')
-  end
-
   before do
     group.add_owner(user)
     sign_in(user)