Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 5 insertions, 4 deletions

diff --git a/spec/models/alert_management/http_integration_spec.rb b/spec/models/alert_management/http_integration_spec.rb
index f88a66a7c27..b453b3a82e0 100644
--- a/spec/models/alert_management/http_integration_spec.rb
+++ b/spec/models/alert_management/http_integration_spec.rb
@@ -13,6 +13,11 @@ RSpec.describe AlertManagement::HttpIntegration do
     it { is_expected.to belong_to(:project) }
   end
 
+  describe 'default values' do
+    it { expect(described_class.new.endpoint_identifier).to be_present }
+    it { expect(described_class.new(endpoint_identifier: 'test').endpoint_identifier).to eq('test') }
+  end
+
   describe 'validations' do
     it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:name) }
@@ -124,10 +129,6 @@ RSpec.describe AlertManagement::HttpIntegration do
     end
 
     context 'when unsaved' do
-      context 'when unassigned' do
-        it_behaves_like 'valid token'
-      end
-
       context 'when assigned' do
         include_context 'assign token', 'random_token'