Add latest changes from gitlab-org/gitlab@master

3 files changed, 36 insertions, 8 deletions

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 3315dd3b974..d9272afadf2 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -411,6 +411,7 @@ project:
 - project_aliases
 - external_pull_requests
 - pages_metadatum
+- alerts_service
 award_emoji:
 - awardable
 - user
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 64de6a8ab9b..40ea248c448 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -19,14 +19,23 @@ describe Clusters::Platforms::Kubernetes do
   it_behaves_like 'having unique enum values'
 
   describe 'before_validation' do
+    let(:kubernetes) { create(:cluster_platform_kubernetes, :configured, namespace: namespace) }
+
     context 'when namespace includes upper case' do
-      let(:kubernetes) { create(:cluster_platform_kubernetes, :configured, namespace: namespace) }
       let(:namespace) { 'ABC' }
 
       it 'converts to lower case' do
         expect(kubernetes.namespace).to eq('abc')
       end
     end
+
+    context 'when namespace is blank' do
+      let(:namespace) { '' }
+
+      it 'nullifies the namespace' do
+        expect(kubernetes.namespace).to be_nil
+      end
+    end
   end
 
   describe 'validation' do
@@ -35,8 +44,8 @@ describe Clusters::Platforms::Kubernetes do
     context 'when validates namespace' do
       let(:kubernetes) { build(:cluster_platform_kubernetes, :configured, namespace: namespace) }
 
-      context 'when namespace is blank' do
-        let(:namespace) { '' }
+      context 'when namespace is nil' do
+        let(:namespace) { nil }
 
         it { is_expected.to be_truthy }
       end
diff --git a/spec/support/shared_contexts/services_shared_context.rb b/spec/support/shared_contexts/services_shared_context.rb
index 4d176ab5fca..113bcc2af9c 100644
--- a/spec/support/shared_contexts/services_shared_context.rb
+++ b/spec/support/shared_contexts/services_shared_context.rb
@@ -28,12 +28,17 @@ Service.available_services_names.each do |service|
       end
     end
 
+    let(:licensed_features) do
+      {
+        'github' => :github_project_service_integration,
+        'jenkins' => :jenkins_integration,
+        'jenkins_deprecated' => :jenkins_integration,
+        'alerts' => :incident_management
+      }
+    end
+
     before do
-      if service == 'github' && respond_to?(:stub_licensed_features)
-        stub_licensed_features(github_project_service_integration: true)
-        project.clear_memoization(:disabled_services)
-        project.clear_memoization(:licensed_feature_available)
-      end
+      enable_license_for_service(service)
     end
 
     def initialize_service(service)
@@ -42,5 +47,18 @@ Service.available_services_names.each do |service|
       service_item.save!
       service_item
     end
+
+    private
+
+    def enable_license_for_service(service)
+      return unless respond_to?(:stub_licensed_features)
+
+      licensed_feature = licensed_features[service]
+      return unless licensed_feature
+
+      stub_licensed_features(licensed_feature => true)
+      project.clear_memoization(:disabled_services)
+      project.clear_memoization(:licensed_feature_available)
+    end
   end
 end