Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 2 deletions

diff --git a/spec/models/concerns/atomic_internal_id_spec.rb b/spec/models/concerns/atomic_internal_id_spec.rb
index b803e699b25..5fe3141eb17 100644
--- a/spec/models/concerns/atomic_internal_id_spec.rb
+++ b/spec/models/concerns/atomic_internal_id_spec.rb
@@ -3,10 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe AtomicInternalId do
-  let(:milestone) { build(:milestone) }
+  let_it_be(:project) { create(:project) }
+  let(:milestone) { build(:milestone, project: project) }
   let(:iid) { double('iid', to_i: 42) }
   let(:external_iid) { 100 }
-  let(:scope_attrs) { { project: milestone.project } }
+  let(:scope_attrs) { { project: project } }
   let(:usage) { :milestones }
 
   describe '#save!' do
@@ -248,4 +249,12 @@ RSpec.describe AtomicInternalId do
       end.to change { InternalId.find_by(project: milestone.project, usage: :milestones)&.last_value.to_i }.by(4)
     end
   end
+
+  describe '.track_project_iid!' do
+    it 'tracks the present value' do
+      expect do
+        ::Issue.track_project_iid!(milestone.project, external_iid)
+      end.to change { InternalId.find_by(project: milestone.project, usage: :issues)&.last_value.to_i }.to(external_iid)
+    end
+  end
 end