Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 41 insertions, 2 deletions

diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 20dee288052..7cf7c360dff 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -8,7 +8,46 @@ RSpec.describe Milestone do
   let(:milestone) { create(:milestone, project: project) }
   let(:project) { create(:project, :public) }
 
-  it_behaves_like 'a timebox', :milestone
+  it_behaves_like 'a timebox', :milestone do
+    describe "#uniqueness_of_title" do
+      context "per project" do
+        it "does not accept the same title in a project twice" do
+          new_timebox = timebox.dup
+          expect(new_timebox).not_to be_valid
+        end
+
+        it "accepts the same title in another project" do
+          project = create(:project)
+          new_timebox = timebox.dup
+          new_timebox.project = project
+
+          expect(new_timebox).to be_valid
+        end
+      end
+
+      context "per group" do
+        let(:timebox) { create(:milestone, *timebox_args, group: group) }
+
+        before do
+          project.update!(group: group)
+        end
+
+        it "does not accept the same title in a group twice" do
+          new_timebox = described_class.new(group: group, title: timebox.title)
+
+          expect(new_timebox).not_to be_valid
+        end
+
+        it "does not accept the same title of a child project timebox" do
+          create(:milestone, *timebox_args, project: group.projects.first)
+
+          new_timebox = described_class.new(group: group, title: timebox.title)
+
+          expect(new_timebox).not_to be_valid
+        end
+      end
+    end
+  end
 
   describe 'MilestoneStruct#serializable_hash' do
     let(:predefined_milestone) { described_class::TimeboxStruct.new('Test Milestone', '#test', 1) }
@@ -158,7 +197,7 @@ RSpec.describe Milestone do
 
     it 'returns false if milestone active and not all nested issues closed' do
       issue.milestone = milestone
-      issue.save
+      issue.save!
 
       expect(milestone.can_be_closed?).to be_falsey
     end