Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 9 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index a46275d90b6..993edcab87d 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -241,6 +241,24 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gi
             expect(cookie['offsets']).to eq({ 'c1' => 1, 'c2' => 2, 'c3' => 3 })
           end
         end
+
+        context 'when a WAL location is nil with existing offsets' do
+          let(:existing_cookie) do
+            {
+              'offsets' => { 'main' => 8, 'ci' => 5 },
+              'wal_locations' => { 'main' => 'loc1old', 'ci' => 'loc2old' }
+            }
+          end
+
+          let(:argv) { ['main', 9, 'loc1', 'ci', nil, 'loc2'] }
+
+          it 'only updates the main connection' do
+            subject
+
+            expect(cookie['wal_locations']).to eq({ 'main' => 'loc1', 'ci' => 'loc2old' })
+            expect(cookie['offsets']).to eq({ 'main' => 9, 'ci' => 5 })
+          end
+        end
       end
     end
 
diff --git a/spec/controllers/projects/incidents_controller_spec.rb b/spec/requests/projects/incidents_controller_spec.rb
index 460821634b0..9a0d6cdf8ce 100644
--- a/spec/controllers/projects/incidents_controller_spec.rb
+++ b/spec/requests/projects/incidents_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::IncidentsController do
+RSpec.describe Projects::IncidentsController, feature_category: :incident_management do
   let_it_be_with_refind(:project) { create(:project) }
   let_it_be(:developer) { create(:user) }
   let_it_be(:guest) { create(:user) }
@@ -33,7 +33,7 @@ RSpec.describe Projects::IncidentsController do
 
   describe 'GET #index' do
     def make_request
-      get :index, params: project_params
+      get project_incidents_path(project)
     end
 
     let(:user) { developer }
@@ -65,7 +65,7 @@ RSpec.describe Projects::IncidentsController do
 
   describe 'GET #show' do
     def make_request
-      get :show, params: project_params(id: resource)
+      get incident_project_issues_path(project, resource)
     end
 
     let_it_be(:resource) { create(:incident, project: project) }
@@ -113,10 +113,4 @@ RSpec.describe Projects::IncidentsController do
       it_behaves_like 'login required'
     end
   end
-
-  private
-
-  def project_params(opts = {})
-    opts.reverse_merge(namespace_id: project.namespace, project_id: project)
-  end
 end