Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 0 deletions

diff --git a/spec/models/alerting/project_alerting_setting_spec.rb b/spec/models/alerting/project_alerting_setting_spec.rb
new file mode 100644
index 00000000000..40fbe3a6e78
--- /dev/null
+++ b/spec/models/alerting/project_alerting_setting_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Alerting::ProjectAlertingSetting do
+  let_it_be(:project) { create(:project) }
+
+  subject { create(:project_alerting_setting, project: project) }
+
+  describe 'Associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe '#token' do
+    context 'when set' do
+      let(:token) { SecureRandom.hex }
+
+      subject do
+        create(:project_alerting_setting, project: project, token: token)
+      end
+
+      it 'reads the token' do
+        expect(subject.token).to eq(token)
+        expect(subject.encrypted_token).not_to be_nil
+        expect(subject.encrypted_token_iv).not_to be_nil
+      end
+    end
+
+    context 'when not set' do
+      before do
+        subject.token = nil
+      end
+
+      it 'generates a token before validation' do
+        expect(subject).to be_valid
+        expect(subject.token).to match(/\A\h{32}\z/)
+      end
+    end
+  end
+end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 15b409b2dcf..44be4985439 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -70,6 +70,7 @@ describe Project do
     it { is_expected.to have_one(:auto_devops).class_name('ProjectAutoDevops') }
     it { is_expected.to have_one(:error_tracking_setting).class_name('ErrorTracking::ProjectErrorTrackingSetting') }
     it { is_expected.to have_one(:project_setting) }
+    it { is_expected.to have_one(:alerting_setting).class_name('Alerting::ProjectAlertingSetting') }
     it { is_expected.to have_many(:commit_statuses) }
     it { is_expected.to have_many(:ci_pipelines) }
     it { is_expected.to have_many(:ci_refs) }