Merge branch 'rodrigo/remove-project-owner-from-import-export' into 'master'

Refactor Import/Export spec to not use project.owner

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111987



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Eugenia Grieff <egrieff@gitlab.com>
Co-authored-by: Rodrigo Tomonari <rtomonari@gitlab.com>

spec/lib/gitlab/import_export/import_export_equivalence_spec.rb

@@ -25,7 +25,8 @@
   end
 
   it 'yields the initial tree when importing and exporting it again' do
-    project = create(:project, creator: create(:user, :admin))
+    project = create(:project)
+    user = create(:user, :admin)
 
     # We first generate a test fixture dynamically from a seed-fixture, so as to
     # account for any fields in the initial fixture that are missing and set to
@@ -34,6 +35,7 @@
     expect(
       restore_then_save_project(
         project,
+        user,
         import_path: seed_fixture_path,
         export_path: test_fixture_path)
     ).to be true
@@ -42,6 +44,7 @@
     expect(
       restore_then_save_project(
         project,
+        user,
         import_path: test_fixture_path,
         export_path: test_tmp_path)
     ).to be true

spec/support/import_export/common_util.rb

@@ -51,22 +51,22 @@ def get_json(path, exportable_path, key, ndjson_enabled)
       json
     end
 
-    def restore_then_save_project(project, import_path:, export_path:)
-      project_restorer = get_project_restorer(project, import_path)
-      project_saver = get_project_saver(project, export_path)
+    def restore_then_save_project(project, user, import_path:, export_path:)
+      project_restorer = get_project_restorer(project, user, import_path)
+      project_saver = get_project_saver(project, user, export_path)
 
       project_restorer.restore && project_saver.save
     end
 
-    def get_project_restorer(project, import_path)
+    def get_project_restorer(project, user, import_path)
       Gitlab::ImportExport::Project::TreeRestorer.new(
-        user: project.creator, shared: get_shared_env(path: import_path), project: project
+        user: user, shared: get_shared_env(path: import_path), project: project
       )
     end
 
-    def get_project_saver(project, export_path)
+    def get_project_saver(project, user, export_path)
       Gitlab::ImportExport::Project::TreeSaver.new(
-        project: project, current_user: project.creator, shared: get_shared_env(path: export_path)
+        project: project, current_user: user, shared: get_shared_env(path: export_path)
       )
     end