Add latest changes from gitlab-org/gitlab@master

3 files changed, 71 insertions, 16 deletions

diff --git a/spec/requests/api/ci/runner/jobs_put_spec.rb b/spec/requests/api/ci/runner/jobs_put_spec.rb
index e9d793d5a22..f4c99307b1a 100644
--- a/spec/requests/api/ci/runner/jobs_put_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_put_spec.rb
@@ -78,6 +78,33 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
           end
         end
 
+        context 'when an exit_code is provided' do
+          context 'when the exit_codes are acceptable' do
+            before do
+              job.options[:allow_failure_criteria] = { exit_codes: [1] }
+              job.save!
+            end
+
+            it 'accepts an exit code' do
+              update_job(state: 'failed', exit_code: 1)
+
+              expect(job.reload).to be_failed
+              expect(job.allow_failure).to be_truthy
+              expect(job).to be_unknown_failure
+            end
+          end
+
+          context 'when the exit_codes are not defined' do
+            it 'ignore the exit code' do
+              update_job(state: 'failed', exit_code: 1)
+
+              expect(job.reload).to be_failed
+              expect(job.allow_failure).to be_falsy
+              expect(job).to be_unknown_failure
+            end
+          end
+        end
+
         context 'when failure_reason is script_failure' do
           before do
             update_job(state: 'failed', failure_reason: 'script_failure')
diff --git a/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb
index dd001a73349..9ab94f1d749 100644
--- a/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb
@@ -60,19 +60,35 @@ RSpec.describe 'getting Alert Management Alert Assignees' do
     expect(second_assignees).to be_empty
   end
 
-  it 'avoids N+1 queries' do
-    base_count = ActiveRecord::QueryRecorder.new do
-      post_graphql(query, current_user: current_user)
+  describe 'performance' do
+    let(:first_n) { var('Int') }
+    let(:params) { { first: first_n } }
+    let(:limited_query) { with_signature([first_n], query) }
+
+    before do
+      create(:alert_management_alert, project: project, assignees: [current_user])
+    end
+
+    it 'can limit results' do
+      post_graphql(limited_query, current_user: current_user, variables: first_n.with(1))
+
+      expect(alerts.size).to eq 1
+      expect(alerts).not_to include(a_hash_including('iid' => first_alert.iid.to_s))
     end
 
-    # An N+1 would mean a new alert would increase the query count
-    third_alert = create(:alert_management_alert, project: project, assignees: [current_user])
+    it 'can include all results' do
+      post_graphql(limited_query, current_user: current_user)
 
-    expect { post_graphql(query, current_user: current_user) }.not_to exceed_query_limit(base_count)
+      expect(alerts.size).to be > 1
+      expect(alerts).to include(a_hash_including('iid' => first_alert.iid.to_s))
+    end
 
-    third_assignees = assignees[third_alert.iid.to_s]
+    it 'avoids N+1 queries' do
+      base_count = ActiveRecord::QueryRecorder.new do
+        post_graphql(limited_query, current_user: current_user, variables: first_n.with(1))
+      end
 
-    expect(third_assignees.length).to eq(1)
-    expect(third_assignees.first).to include('username' => current_user.username)
+      expect { post_graphql(limited_query, current_user: current_user) }.not_to exceed_query_limit(base_count)
+    end
   end
 end
diff --git a/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb b/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb
index 1350cba119b..5d46f370756 100644
--- a/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb
@@ -65,16 +65,28 @@ RSpec.describe 'getting Alert Management Alert Notes' do
     expect(second_notes_result).to be_empty
   end
 
-  it 'avoids N+1 queries' do
-    base_count = ActiveRecord::QueryRecorder.new do
-      post_graphql(query, current_user: current_user)
+  describe 'performance' do
+    let(:first_n) { var('Int') }
+    let(:params) { { first: first_n } }
+
+    before do
+      # An N+1 would mean a new alert would increase the query count
+      create(:alert_management_alert, project: project)
     end
 
-    # An N+1 would mean a new alert would increase the query count
-    create(:alert_management_alert, project: project)
+    it 'avoids N+1 queries' do
+      q = with_signature([first_n], query)
 
-    expect { post_graphql(query, current_user: current_user) }.not_to exceed_query_limit(base_count)
-    expect(alerts_result.length).to eq(3)
+      base_count = ActiveRecord::QueryRecorder.new do
+        post_graphql(q, current_user: current_user, variables: first_n.with(1))
+        expect(alerts_result.length).to eq(1)
+      end
+
+      expect do
+        post_graphql(q, current_user: current_user, variables: first_n.with(3))
+        expect(alerts_result.length).to eq(3)
+      end.not_to exceed_query_limit(base_count)
+    end
   end
 
   context 'for non-system notes' do