Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 4 insertions, 1 deletions

diff --git a/spec/models/release_spec.rb b/spec/models/release_spec.rb
index 125fec61d72..4ae1927dcca 100644
--- a/spec/models/release_spec.rb
+++ b/spec/models/release_spec.rb
@@ -53,7 +53,10 @@ RSpec.describe Release do
     context 'when a release is tied to a milestone for another project' do
       it 'creates a validation error' do
         milestone = build(:milestone, project: create(:project))
-        expect { release.milestones << milestone }.to raise_error
+
+        expect { release.milestones << milestone }
+          .to raise_error(ActiveRecord::RecordInvalid,
+                          'Validation failed: Release does not have the same project as the milestone')
       end
     end