Merge branch '340495_create_project_namespace_on_project_create' into 'master'

Create ProjectNamespace when a Project is created

See merge request gitlab-org/gitlab!70972

app/models/namespace.rb

@@ -497,6 +497,10 @@ class Namespace < ApplicationRecord
     Feature.enabled?(:block_issue_repositioning, self, type: :ops, default_enabled: :yaml)
   end
 
+  def project_namespace_creation_enabled?
+    Feature.enabled?(:create_project_namespace_on_project_create, self, default_enabled: :yaml)
+  end
+
   private
 
   def expire_child_caches

app/models/namespaces/project_namespace.rb

@@ -4,8 +4,6 @@ module Namespaces
   class ProjectNamespace < Namespace
     has_one :project, foreign_key: :project_namespace_id, inverse_of: :project_namespace
 
-    validates :project, presence: true
-
     def self.sti_name
       'Project'
     end

app/models/project.rb

@@ -98,7 +98,7 @@ class Project < ApplicationRecord
   before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? }
 
   before_save :ensure_runners_token
-  before_save :ensure_project_namespace_in_sync
+  before_validation :ensure_project_namespace_in_sync
 
   after_save :update_project_statistics, if: :saved_change_to_namespace_id?
 
@@ -147,7 +147,7 @@ class Project < ApplicationRecord
   belongs_to :namespace
   # Sync deletion via DB Trigger to ensure we do not have
   # a project without a project_namespace (or vice-versa)
-  belongs_to :project_namespace, autosave: true, class_name: 'Namespaces::ProjectNamespace', foreign_key: 'project_namespace_id', inverse_of: :project
+  belongs_to :project_namespace, autosave: true, class_name: 'Namespaces::ProjectNamespace', foreign_key: 'project_namespace_id'
   alias_method :parent, :namespace
   alias_attribute :parent_id, :namespace_id
 
@@ -476,6 +476,7 @@ class Project < ApplicationRecord
   validates :project_feature, presence: true
 
   validates :namespace, presence: true
+  validates :project_namespace, presence: true, if: -> { self.namespace && self.root_namespace.project_namespace_creation_enabled? }
   validates :name, uniqueness: { scope: :namespace_id }
   validates :import_url, public_url: { schemes: ->(project) { project.persisted? ? VALID_MIRROR_PROTOCOLS : VALID_IMPORT_PROTOCOLS },
                                        ports: ->(project) { project.persisted? ? VALID_MIRROR_PORTS : VALID_IMPORT_PORTS },
@@ -2919,13 +2920,29 @@ class Project < ApplicationRecord
   end
 
   def ensure_project_namespace_in_sync
-    if changes.keys & [:name, :path, :namespace_id, :visibility_level] && project_namespace.present?
+    # create project_namespace when project is created if create_project_namespace_on_project_create FF is enabled
+    build_project_namespace if project_namespace_creation_enabled?
+
+    # regardless of create_project_namespace_on_project_create FF we need
+    # to keep project and project namespace in sync if there is one
+    sync_attributes(project_namespace) if sync_project_namespace?
+  end
+
+  def project_namespace_creation_enabled?
+    new_record? && !project_namespace && self.namespace && self.root_namespace.project_namespace_creation_enabled?
+  end
+
+  def sync_project_namespace?
+    (changes.keys & %w(name path namespace_id namespace visibility_level shared_runners_enabled)).any? && project_namespace.present?
+  end
+
+  def sync_attributes(project_namespace)
     project_namespace.name = name
     project_namespace.path = path
     project_namespace.parent = namespace
+    project_namespace.shared_runners_enabled = shared_runners_enabled
     project_namespace.visibility_level = visibility_level
   end
-  end
 end
 
 Project.prepend_mod_with('Project')

config/feature_flags/development/create_project_namespace_on_project_create.yml

+---
+name: create_project_namespace_on_project_create
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70972
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344954
+milestone: '14.5'
+type: development
+group: group::workspace
+default_enabled: false

db/fixtures/development/17_cycle_analytics.rb

@@ -157,16 +157,17 @@ class Gitlab::Seeder::CycleAnalytics
   end
 
   def create_new_vsm_project
+    namespace = FactoryBot.create(
+      :group,
+      name: "Value Stream Management Group #{suffix}",
+      path: "vsmg-#{suffix}"
+    )
     project = FactoryBot.create(
       :project,
       name: "Value Stream Management Project #{suffix}",
       path: "vsmp-#{suffix}",
       creator: admin,
-      namespace: FactoryBot.create(
-        :group,
-        name: "Value Stream Management Group #{suffix}",
-        path: "vsmg-#{suffix}"
-      )
+      namespace: namespace
     )
 
     project.create_repository

ee/spec/requests/api/namespaces_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe API::Namespaces do
   let_it_be(:ultimate_plan) { create(:ultimate_plan) }
   let_it_be(:project) { create(:project, namespace: group2) }
   let_it_be(:project) { create(:project, namespace: group2, name: group2.name, path: group2.path) }
-  let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+  let_it_be(:project_namespace) { project.project_namespace }
 
   describe "GET /namespaces" do
     context "when authenticated as admin" do

ee/spec/services/projects/destroy_service_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe Projects::DestroyService do
   end
 
   context 'when project has an associated ProjectNamespace' do
-    let!(:project_namespace) { create(:project_namespace, project: project) }
+    let!(:project_namespace) { project.project_namespace }
 
     it 'destroys the associated ProjectNamespace also' do
       subject.execute

spec/factories/namespaces/project_namespaces.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :project_namespace, class: 'Namespaces::ProjectNamespace' do
-    project
+    association :project, factory: :project, strategy: :build
     parent { project.namespace }
     visibility_level { project.visibility_level }
     name { project.name }

spec/lib/gitlab/database/count/reltuples_count_strategy_spec.rb

@@ -38,7 +38,8 @@ RSpec.describe Gitlab::Database::Count::ReltuplesCountStrategy do
       it 'returns nil counts for inherited tables' do
         models.each { |model| expect(model).not_to receive(:count) }
 
-        expect(subject).to eq({ Namespace => 3 })
+        # 3 Namespaces as parents for each Project and 3 ProjectNamespaces(for each Project)
+        expect(subject).to eq({ Namespace => 6 })
       end
     end
 

spec/lib/gitlab/database/count/tablesample_count_strategy_spec.rb

@@ -47,7 +47,8 @@ RSpec.describe Gitlab::Database::Count::TablesampleCountStrategy do
         result = subject
         expect(result[Project]).to eq(3)
         expect(result[Group]).to eq(1)
-        expect(result[Namespace]).to eq(4)
+        # 1-Group, 3 namespaces for each project and 3 project namespaces for each project
+        expect(result[Namespace]).to eq(7)
       end
     end
 

spec/lib/gitlab/path_regex_spec.rb

@@ -425,6 +425,9 @@ RSpec.describe Gitlab::PathRegex do
     it { is_expected.not_to match('gitlab.org/') }
     it { is_expected.not_to match('/gitlab.org') }
     it { is_expected.not_to match('gitlab git') }
+    it { is_expected.not_to match('gitlab?') }
+    it { is_expected.to match('gitlab.org-') }
+    it { is_expected.to match('gitlab.org_') }
   end
 
   describe '.project_path_format_regex' do
@@ -437,6 +440,14 @@ RSpec.describe Gitlab::PathRegex do
     it { is_expected.not_to match('?gitlab') }
     it { is_expected.not_to match('git lab') }
     it { is_expected.not_to match('gitlab.git') }
+    it { is_expected.not_to match('gitlab?') }
+    it { is_expected.not_to match('gitlab git') }
+    it { is_expected.to match('gitlab.org') }
+    it { is_expected.to match('gitlab.org-') }
+    it { is_expected.to match('gitlab.org_') }
+    it { is_expected.to match('gitlab.org.') }
+    it { is_expected.not_to match('gitlab.org/') }
+    it { is_expected.not_to match('/gitlab.org') }
   end
 
   context 'repository routes' do

spec/models/concerns/loaded_in_group_list_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe LoadedInGroupList do
     context 'with project namespaces' do
       let_it_be(:group1) { create(:group, parent: parent) }
       let_it_be(:group2) { create(:group, parent: parent) }
-      let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+      let_it_be(:project_namespace) { project.project_namespace }
 
       it 'does not include project_namespaces in the count of subgroups' do
         expect(found_group.preloaded_subgroup_count).to eq(3)

spec/models/group_spec.rb

@@ -566,7 +566,7 @@ RSpec.describe Group do
 
       context 'when project namespace exists in the group' do
         let!(:project) { create(:project, group: group) }
-        let!(:project_namespace) { create(:project_namespace, project: project) }
+        let!(:project_namespace) { project.project_namespace }
 
         it 'filters out project namespace' do
           expect(group.descendants.find_by_id(project_namespace.id)).to be_nil

spec/models/namespace_spec.rb

@@ -32,9 +32,10 @@ RSpec.describe Namespace do
     describe '#children' do
       let_it_be(:group) { create(:group) }
       let_it_be(:subgroup) { create(:group, parent: group) }
-      let_it_be(:project_namespace) { create(:project_namespace, parent: group) }
+      let_it_be(:project_with_namespace) { create(:project, namespace: group) }
 
       it 'excludes project namespaces' do
+        expect(project_with_namespace.project_namespace.parent).to eq(group)
         expect(group.children).to match_array([subgroup])
       end
     end
@@ -239,7 +240,9 @@ RSpec.describe Namespace do
         let(:namespace) { build(:project_namespace) }
 
         it 'allows to update path to single char' do
-          namespace = create(:project_namespace)
+          project = create(:project)
+          namespace = project.project_namespace
+
           namespace.update!(path: 'j')
 
           expect(namespace).to be_valid
@@ -342,9 +345,13 @@ RSpec.describe Namespace do
 
     describe '.without_project_namespaces' do
       let_it_be(:user_namespace) { create(:user_namespace) }
-      let_it_be(:project_namespace) { create(:project_namespace) }
+      let_it_be(:project) { create(:project) }
+      let_it_be(:project_namespace) { project.project_namespace }
 
       it 'excludes project namespaces' do
+        expect(project_namespace).not_to be_nil
+        expect(project_namespace.parent).not_to be_nil
+        expect(described_class.all).to include(project_namespace)
         expect(described_class.without_project_namespaces).to match_array([namespace, namespace1, namespace2, namespace1sub, namespace2sub, user_namespace, project_namespace.parent])
       end
     end
@@ -562,7 +569,7 @@ RSpec.describe Namespace do
 
     context 'with project namespaces' do
       let_it_be(:project) { create(:project, namespace: parent_group, path: 'some-new-path') }
-      let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+      let_it_be(:project_namespace) { project.project_namespace }
 
       it 'does not return project namespace' do
         search_result = described_class.search('path')

spec/models/namespaces/project_namespace_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Namespaces::ProjectNamespace, type: :model do
     # using delete rather than destroy due to `delete` skipping AR hooks/callbacks
     # so it's ensured to work at the DB level. Uses ON DELETE CASCADE on foreign key
     let_it_be(:project) { create(:project) }
-    let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+    let_it_be(:project_namespace) { project.project_namespace }
 
     it 'also deletes the associated project' do
       project_namespace.delete

spec/models/project_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Project, factory_default: :keep do
   describe 'associations' do
     it { is_expected.to belong_to(:group) }
     it { is_expected.to belong_to(:namespace) }
-    it { is_expected.to belong_to(:project_namespace).class_name('Namespaces::ProjectNamespace').with_foreign_key('project_namespace_id').inverse_of(:project) }
+    it { is_expected.to belong_to(:project_namespace).class_name('Namespaces::ProjectNamespace').with_foreign_key('project_namespace_id') }
     it { is_expected.to belong_to(:creator).class_name('User') }
     it { is_expected.to belong_to(:pool_repository) }
     it { is_expected.to have_many(:users) }
@@ -191,7 +191,7 @@ RSpec.describe Project, factory_default: :keep do
       # using delete rather than destroy due to `delete` skipping AR hooks/callbacks
       # so it's ensured to work at the DB level. Uses AFTER DELETE trigger.
       let_it_be(:project) { create(:project) }
-      let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+      let_it_be(:project_namespace) { project.project_namespace }
 
       it 'also deletes the associated ProjectNamespace' do
         project.delete
@@ -233,6 +233,58 @@ RSpec.describe Project, factory_default: :keep do
         expect(project.project_setting).to be_an_instance_of(ProjectSetting)
         expect(project.project_setting).to be_new_record
       end
+
+      context 'with project namespaces' do
+        it 'automatically creates a project namespace' do
+          project = build(:project, path: 'hopefully-valid-path1')
+          project.save!
+
+          expect(project).to be_persisted
+          expect(project.project_namespace).to be_persisted
+          expect(project.project_namespace).to be_in_sync_with_project(project)
+        end
+
+        context 'with FF disabled' do
+          before do
+            stub_feature_flags(create_project_namespace_on_project_create: false)
+          end
+
+          it 'does not create a project namespace' do
+            project = build(:project, path: 'hopefully-valid-path2')
+            project.save!
+
+            expect(project).to be_persisted
+            expect(project.project_namespace).to be_nil
+          end
+        end
+      end
+    end
+
+    context 'updating a project' do
+      context 'with project namespaces' do
+        it 'keeps project namespace in sync with project' do
+          project = create(:project)
+          project.update!(path: 'hopefully-valid-path1')
+
+          expect(project).to be_persisted
+          expect(project.project_namespace).to be_persisted
+          expect(project.project_namespace).to be_in_sync_with_project(project)
+        end
+
+        context 'with FF disabled' do
+          before do
+            stub_feature_flags(create_project_namespace_on_project_create: false)
+          end
+
+          it 'does not create a project namespace when project is updated' do
+            project = create(:project)
+            project.update!(path: 'hopefully-valid-path1')
+
+            expect(project).to be_persisted
+            expect(project.project_namespace).to be_nil
+          end
+        end
+      end
     end
 
     context 'updating cd_cd_settings' do
@@ -322,6 +374,18 @@ RSpec.describe Project, factory_default: :keep do
       create(:project)
     end
 
+    context 'validates project namespace creation' do
+      it 'does not create project namespace if project is not created' do
+        project = build(:project, path: 'tree')
+
+        project.valid?
+
+        expect(project).not_to be_valid
+        expect(project).to be_new_record
+        expect(project.project_namespace).to be_new_record
+      end
+    end
+
     context 'repository storages inclusion' do
       let(:project2) { build(:project, repository_storage: 'missing') }
 

spec/policies/namespaces/project_namespace_policy_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 
 RSpec.describe NamespacePolicy do
   let_it_be(:parent) { create(:namespace) }
-  let_it_be(:namespace) { create(:project_namespace, parent: parent) }
+  let_it_be(:project) { create(:project, namespace: parent) }
+  let_it_be(:namespace) { project.project_namespace }
 
   let(:permissions) do
     [:owner_access, :create_projects, :admin_namespace, :read_namespace,

spec/requests/api/namespaces_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe API::Namespaces do
   let_it_be(:group1) { create(:group, name: 'group.one') }
   let_it_be(:group2) { create(:group, :nested) }
   let_it_be(:project) { create(:project, namespace: group2, name: group2.name, path: group2.path) }
-  let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+  let_it_be(:project_namespace) { project.project_namespace }
 
   describe "GET /namespaces" do
     context "when unauthenticated" do

spec/requests/api/project_import_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe API::ProjectImport do
     it 'executes a limited number of queries' do
       control_count = ActiveRecord::QueryRecorder.new { subject }.count
 
-      expect(control_count).to be <= 100
+      expect(control_count).to be <= 101
     end
 
     it 'schedules an import using a namespace' do

spec/services/groups/transfer_service_spec.rb

@@ -185,9 +185,7 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
 
         context 'when projects have project namespaces' do
           let_it_be(:project1) { create(:project, :private, namespace: group) }
-          let_it_be(:project_namespace1) { create(:project_namespace, project: project1) }
           let_it_be(:project2) { create(:project, :private, namespace: group) }
-          let_it_be(:project_namespace2) { create(:project_namespace, project: project2) }
 
           it_behaves_like 'project namespace path is in sync with project path' do
             let(:group_full_path) { "#{group.path}" }
@@ -250,21 +248,31 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
         let_it_be(:membership) { create(:group_member, :owner, group: new_parent_group, user: user) }
         let_it_be(:project) { create(:project, path: 'foo', namespace: new_parent_group) }
 
-        before do
-          group.update_attribute(:path, 'foo')
+        it 'adds an error on group' do
+          expect(transfer_service.execute(new_parent_group)).to be_falsy
+          expect(transfer_service.error).to eq('Transfer failed: The parent group already has a subgroup or a project with the same path.')
         end
 
-        it 'returns false' do
-          expect(transfer_service.execute(new_parent_group)).to be_falsy
+        # currently when a project is created it gets a corresponding project namespace
+        # so we test the case where a project without a project namespace is transferred
+        # for backward compatibility
+        context 'without project namespace' do
+          before do
+            project_namespace = project.project_namespace
+            project.update_column(:project_namespace_id, nil)
+            project_namespace.delete
           end
 
           it 'adds an error on group' do
-          transfer_service.execute(new_parent_group)
+            expect(project.reload.project_namespace).to be_nil
+            expect(transfer_service.execute(new_parent_group)).to be_falsy
             expect(transfer_service.error).to eq('Transfer failed: Validation failed: Group URL has already been taken')
           end
+        end
+      end
 
       context 'when projects have project namespaces' do
-          let!(:project_namespace) { create(:project_namespace, project: project) }
+        let_it_be(:project) { create(:project, path: 'foo', namespace: new_parent_group) }
 
         before do
           transfer_service.execute(new_parent_group)
@@ -275,7 +283,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
           let(:projects_with_project_namespace) { [project] }
         end
       end
-      end
 
       context 'when the group is allowed to be transferred' do
         let_it_be(:new_parent_group, reload: true) { create(:group, :public) }
@@ -445,8 +452,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
       context 'when transferring a group with project descendants' do
         let!(:project1) { create(:project, :repository, :private, namespace: group) }
         let!(:project2) { create(:project, :repository, :internal, namespace: group) }
-        let!(:project_namespace1) { create(:project_namespace, project: project1) }
-        let!(:project_namespace2) { create(:project_namespace, project: project2) }
 
         before do
           TestEnv.clean_test_path
@@ -483,8 +488,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
           let!(:project1) { create(:project, :repository, :public, namespace: group) }
           let!(:project2) { create(:project, :repository, :public, namespace: group) }
           let!(:new_parent_group) { create(:group, :private) }
-          let!(:project_namespace1) { create(:project_namespace, project: project1) }
-          let!(:project_namespace2) { create(:project_namespace, project: project2) }
 
           it 'updates projects visibility to match the new parent' do
             group.projects.each do |project|
@@ -504,8 +507,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
         let!(:project2) { create(:project, :repository, :internal, namespace: group) }
         let!(:subgroup1) { create(:group, :private, parent: group) }
         let!(:subgroup2) { create(:group, :internal, parent: group) }
-        let!(:project_namespace1) { create(:project_namespace, project: project1) }
-        let!(:project_namespace2) { create(:project_namespace, project: project2) }
 
         before do
           TestEnv.clean_test_path

spec/services/projects/create_service_spec.rb

@@ -49,6 +49,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       it 'keeps them as specified' do
         expect(project.name).to eq('one')
         expect(project.path).to eq('two')
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
 
@@ -58,6 +59,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       it 'sets name == path' do
         expect(project.path).to eq('one.two_three-four')
         expect(project.name).to eq(project.path)
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
 
@@ -67,6 +69,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       it 'sets path == name' do
         expect(project.name).to eq('one.two_three-four')
         expect(project.path).to eq(project.name)
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
 
@@ -78,6 +81,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       it 'parameterizes the name' do
         expect(project.name).to eq('one.two_three-four and five')
         expect(project.path).to eq('one-two_three-four-and-five')
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
   end
@@ -111,13 +115,14 @@ RSpec.describe Projects::CreateService, '#execute' do
   end
 
   context 'user namespace' do
-    it do
+    it 'creates a project in user namespace' do
       project = create_project(user, opts)
 
       expect(project).to be_valid
       expect(project.owner).to eq(user)
       expect(project.team.maintainers).to include(user)
       expect(project.namespace).to eq(user.namespace)
+      expect(project.project_namespace).to be_in_sync_with_project(project)
     end
   end
 
@@ -151,6 +156,7 @@ RSpec.describe Projects::CreateService, '#execute' do
         expect(project.owner).to eq(user)
         expect(project.team.maintainers).to contain_exactly(user)
         expect(project.namespace).to eq(user.namespace)
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
 
@@ -160,6 +166,7 @@ RSpec.describe Projects::CreateService, '#execute' do
         project = create_project(admin, opts)
 
         expect(project).not_to be_persisted
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
   end
@@ -183,6 +190,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       expect(project.namespace).to eq(group)
       expect(project.team.owners).to include(user)
       expect(user.authorized_projects).to include(project)
+      expect(project.project_namespace).to be_in_sync_with_project(project)
     end
   end
 
@@ -339,6 +347,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       end
 
       imported_project
+      expect(imported_project.project_namespace).to be_in_sync_with_project(imported_project)
     end
 
     it 'stores import data and URL' do
@@ -406,6 +415,7 @@ RSpec.describe Projects::CreateService, '#execute' do
         expect(project.visibility_level).to eq(project_level)
         expect(project).to be_saved
         expect(project).to be_valid
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
     end
   end
@@ -424,6 +434,7 @@ RSpec.describe Projects::CreateService, '#execute' do
         expect(project.errors.messages[:visibility_level].first).to(
           match('restricted by your GitLab administrator')
         )
+        expect(project.project_namespace).to be_in_sync_with_project(project)
       end
 
       it 'does not allow a restricted visibility level for admins when admin mode is disabled' do
@@ -493,6 +504,7 @@ RSpec.describe Projects::CreateService, '#execute' do
       expect(project).to be_valid
       expect(project.owner).to eq(user)
       expect(project.namespace).to eq(user.namespace)
+      expect(project.project_namespace).to be_in_sync_with_project(project)
     end
 
     context 'when another repository already exists on disk' do
@@ -522,6 +534,7 @@ RSpec.describe Projects::CreateService, '#execute' do
           expect(project).to respond_to(:errors)
           expect(project.errors.messages).to have_key(:base)
           expect(project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+          expect(project.project_namespace).to be_in_sync_with_project(project)
         end
 
         it 'does not allow to import project when path matches existing repository on disk' do
@@ -531,6 +544,7 @@ RSpec.describe Projects::CreateService, '#execute' do
           expect(project).to respond_to(:errors)
           expect(project.errors.messages).to have_key(:base)
           expect(project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+          expect(project.project_namespace).to be_in_sync_with_project(project)
         end
       end
 
@@ -555,6 +569,7 @@ RSpec.describe Projects::CreateService, '#execute' do
           expect(project).to respond_to(:errors)
           expect(project.errors.messages).to have_key(:base)
           expect(project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+          expect(project.project_namespace).to be_in_sync_with_project(project)
         end
       end
     end
@@ -870,6 +885,7 @@ RSpec.describe Projects::CreateService, '#execute' do
 
             expect(project).to be_valid
             expect(project.shared_runners_enabled).to eq(expected_result_for_project)
+            expect(project.project_namespace).to be_in_sync_with_project(project)
           end
         end
       end
@@ -890,6 +906,7 @@ RSpec.describe Projects::CreateService, '#execute' do
 
             expect(project).to be_valid
             expect(project.shared_runners_enabled).to eq(expected_result_for_project)
+            expect(project.project_namespace).to be_in_sync_with_project(project)
           end
         end
       end
@@ -907,6 +924,7 @@ RSpec.describe Projects::CreateService, '#execute' do
             expect(project.persisted?).to eq(false)
             expect(project).to be_invalid
             expect(project.errors[:shared_runners_enabled]).to include('cannot be enabled because parent group does not allow it')
+            expect(project.project_namespace).to be_in_sync_with_project(project)
           end
         end
       end
@@ -926,6 +944,7 @@ RSpec.describe Projects::CreateService, '#execute' do
 
           expect(project).to be_valid
           expect(project.shared_runners_enabled).to eq(expected_result)
+          expect(project.project_namespace).to be_in_sync_with_project(project)
         end
       end
     end

spec/services/projects/transfer_service_spec.rb

@@ -66,8 +66,6 @@ RSpec.describe Projects::TransferService do
     end
 
     context 'when project has an associated project namespace' do
-      let!(:project_namespace) { create(:project_namespace, project: project) }
-
       it 'keeps project namespace in sync with project' do
         transfer_result = execute_transfer
 
@@ -272,8 +270,6 @@ RSpec.describe Projects::TransferService do
     end
 
     context 'when project has an associated project namespace' do
-      let!(:project_namespace) { create(:project_namespace, project: project) }
-
       it 'keeps project namespace in sync with project' do
         attempt_project_transfer
 
@@ -294,8 +290,6 @@ RSpec.describe Projects::TransferService do
     end
 
     context 'when project has an associated project namespace' do
-      let!(:project_namespace) { create(:project_namespace, project: project) }
-
       it 'keeps project namespace in sync with project' do
         transfer_result = execute_transfer
 

spec/support/matchers/project_namespace_matcher.rb

+# frozen_string_literal: true
+
+RSpec::Matchers.define :be_in_sync_with_project do |project|
+  match do |project_namespace|
+    # if project is not persisted make sure we do not have a persisted project_namespace for it
+    break false if project.new_record? && project_namespace&.persisted?
+    # don't really care if project is not in sync if the project was never persisted.
+    break true if project.new_record? && !project_namespace.present?
+
+    project_namespace.present? &&
+      project.name == project_namespace.name &&
+      project.path == project_namespace.path &&
+      project.namespace == project_namespace.parent &&
+      project.visibility_level == project_namespace.visibility_level &&
+      project.shared_runners_enabled == project_namespace.shared_runners_enabled
+  end
+
+  failure_message_when_negated do |project_namespace|
+    if project.new_record? && project_namespace&.persisted?
+      "expected that a non persisted project #{project} does not have a persisted project namespace #{project_namespace}"
+    else
+      <<-MSG
+        expected that the project's attributes name, path, namespace_id, visibility_level, shared_runners_enabled
+        are in sync with the corresponding project namespace attributes
+      MSG
+    end
+  end
+end

spec/support/shared_examples/namespaces/traversal_examples.rb

@@ -23,7 +23,7 @@ RSpec.shared_examples 'namespace traversal' do
   let_it_be(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
   let_it_be(:groups) { [group, nested_group, deep_nested_group, very_deep_nested_group] }
   let_it_be(:project) { create(:project, group: nested_group) }
-  let_it_be(:project_namespace) { create(:project_namespace, project: project) }
+  let_it_be(:project_namespace) { project.project_namespace }
 
   describe '#root_ancestor' do
     it 'returns the correct root ancestor' do