Track storage location for legacy storage projects

app/models/project.rb

@@ -1244,10 +1244,8 @@ class Project < ActiveRecord::Base
   end
 
   def track_project_repository
-    return unless hashed_storage?(:repository)
-
-    project_repo = project_repository || build_project_repository
-    project_repo.update!(shard_name: repository_storage, disk_path: disk_path)
+    repository = project_repository || build_project_repository
+    repository.update!(shard_name: repository_storage, disk_path: disk_path)
   end
 
   def create_repository(force: false)

spec/models/project_spec.rb

@@ -1651,26 +1651,54 @@ describe Project do
   end
 
   describe '#track_project_repository' do
-    let(:project) { create(:project, :repository) }
+    shared_examples 'tracks storage location' do
+      context 'when a project repository entry does not exist' do
+        it 'creates a new entry' do
+          expect { project.track_project_repository }.to change(project, :project_repository)
+        end
 
-    it 'creates a project_repository' do
+        it 'tracks the project storage location' do
           project.track_project_repository
 
-      expect(project.reload.project_repository).to be_present
-      expect(project.project_repository.disk_path).to eq(project.disk_path)
-      expect(project.project_repository.shard_name).to eq(project.repository_storage)
+          expect(project.project_repository).to have_attributes(
+            disk_path: project.disk_path,
+            shard_name: project.repository_storage
+          )
+        end
       end
 
-    it 'updates the project_repository' do
-      project.track_project_repository
+      context 'when a tracking entry exists' do
+        let!(:project_repository) { create(:project_repository, project: project) }
+        let!(:shard) { create(:shard, name: 'foo') }
 
-      allow(project).to receive(:disk_path).and_return('@fancy/new/path')
+        it 'does not create a new entry in the database' do
+          expect { project.track_project_repository }.not_to change(project, :project_repository)
+        end
+
+        it 'updates the project storage location' do
+          allow(project).to receive(:disk_path).and_return('fancy/new/path')
+          allow(project).to receive(:repository_storage).and_return('foo')
 
-      expect do
           project.track_project_repository
-      end.not_to change(ProjectRepository, :count)
 
-      expect(project.reload.project_repository.disk_path).to eq(project.disk_path)
+          expect(project.project_repository).to have_attributes(
+            disk_path: 'fancy/new/path',
+            shard_name: 'foo'
+          )
+        end
+      end
+    end
+
+    context 'with projects on legacy storage' do
+      let(:project) { create(:project, :repository, :legacy_storage) }
+
+      it_behaves_like 'tracks storage location'
+    end
+
+    context 'with projects on hashed storage' do
+      let(:project) { create(:project, :repository) }
+
+      it_behaves_like 'tracks storage location'
     end
   end