Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 23 insertions, 5 deletions

diff --git a/spec/frontend/fixtures/api_merge_requests.rb b/spec/frontend/fixtures/api_merge_requests.rb
index 47321fbbeaa..75bc8c8df25 100644
--- a/spec/frontend/fixtures/api_merge_requests.rb
+++ b/spec/frontend/fixtures/api_merge_requests.rb
@@ -9,11 +9,13 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do
   let_it_be(:admin) { create(:admin, name: 'root') }
   let_it_be(:namespace) { create(:namespace, name: 'gitlab-test' )}
   let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') }
+  let_it_be(:early_mrs) do
+    4.times { |i| create(:merge_request, source_project: project, source_branch: "branch-#{i}") }
+  end
+
   let_it_be(:mr) { create(:merge_request, source_project: project) }
 
   it 'api/merge_requests/get.json' do
-    4.times { |i| create(:merge_request, source_project: project, source_branch: "branch-#{i}") }
-
     get api("/projects/#{project.id}/merge_requests", admin)
 
     expect(response).to be_successful
diff --git a/spec/frontend/fixtures/runner.rb b/spec/frontend/fixtures/runner.rb
index 25049ee4722..e17e73a93c4 100644
--- a/spec/frontend/fixtures/runner.rb
+++ b/spec/frontend/fixtures/runner.rb
@@ -67,7 +67,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      runner_query = 'details/runner.query.graphql'
+      runner_query = 'show/runner.query.graphql'
 
       let_it_be(:query) do
         get_graphql_query_as_string("#{query_path}#{runner_query}")
@@ -91,7 +91,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      runner_projects_query = 'details/runner_projects.query.graphql'
+      runner_projects_query = 'show/runner_projects.query.graphql'
 
       let_it_be(:query) do
         get_graphql_query_as_string("#{query_path}#{runner_projects_query}")
@@ -107,7 +107,23 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      runner_jobs_query = 'details/runner_jobs.query.graphql'
+      runner_jobs_query = 'show/runner_jobs.query.graphql'
+
+      let_it_be(:query) do
+        get_graphql_query_as_string("#{query_path}#{runner_jobs_query}")
+      end
+
+      it "#{fixtures_path}#{runner_jobs_query}.json" do
+        post_graphql(query, current_user: admin, variables: {
+          id: instance_runner.to_global_id.to_s
+        })
+
+        expect_graphql_errors_to_be_empty
+      end
+    end
+
+    describe GraphQL::Query, type: :request do
+      runner_jobs_query = 'edit/runner_form.query.graphql'
 
       let_it_be(:query) do
         get_graphql_query_as_string("#{query_path}#{runner_jobs_query}")