Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 14 deletions

diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb
index 778ae218160..7873d59dbad 100644
--- a/spec/frontend/fixtures/projects.rb
+++ b/spec/frontend/fixtures/projects.rb
@@ -61,13 +61,12 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
         clean_frontend_fixtures('graphql/projects/access_tokens')
       end
 
-      fragment_paths = ['graphql_shared/fragments/pageInfo.fragment.graphql']
       base_input_path = 'access_tokens/graphql/queries/'
       base_output_path = 'graphql/projects/access_tokens/'
       query_name = 'get_projects.query.graphql'
 
       it "#{base_output_path}#{query_name}.json" do
-        query = get_graphql_query_as_string("#{base_input_path}#{query_name}", fragment_paths)
+        query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
 
         post_graphql(query, current_user: user, variables: { search: '', first: 2 })
 
diff --git a/spec/frontend/fixtures/releases.rb b/spec/frontend/fixtures/releases.rb
index ac34400bc01..e8f259fba15 100644
--- a/spec/frontend/fixtures/releases.rb
+++ b/spec/frontend/fixtures/releases.rb
@@ -133,15 +133,13 @@ RSpec.describe 'Releases (JavaScript fixtures)' do
     all_releases_query_path = 'releases/graphql/queries/all_releases.query.graphql'
     one_release_query_path = 'releases/graphql/queries/one_release.query.graphql'
     one_release_for_editing_query_path = 'releases/graphql/queries/one_release_for_editing.query.graphql'
-    release_fragment_path = 'releases/graphql/fragments/release.fragment.graphql'
-    release_for_editing_fragment_path = 'releases/graphql/fragments/release_for_editing.fragment.graphql'
 
     before(:all) do
       clean_frontend_fixtures('graphql/releases/')
     end
 
     it "graphql/#{all_releases_query_path}.json" do
-      query = get_graphql_query_as_string(all_releases_query_path, [release_fragment_path])
+      query = get_graphql_query_as_string(all_releases_query_path)
 
       post_graphql(query, current_user: admin, variables: { fullPath: project.full_path })
 
@@ -150,7 +148,7 @@ RSpec.describe 'Releases (JavaScript fixtures)' do
     end
 
     it "graphql/#{one_release_query_path}.json" do
-      query = get_graphql_query_as_string(one_release_query_path, [release_fragment_path])
+      query = get_graphql_query_as_string(one_release_query_path)
 
       post_graphql(query, current_user: admin, variables: { fullPath: project.full_path, tagName: release.tag })
 
@@ -159,7 +157,7 @@ RSpec.describe 'Releases (JavaScript fixtures)' do
     end
 
     it "graphql/#{one_release_for_editing_query_path}.json" do
-      query = get_graphql_query_as_string(one_release_for_editing_query_path, [release_for_editing_fragment_path])
+      query = get_graphql_query_as_string(one_release_for_editing_query_path)
 
       post_graphql(query, current_user: admin, variables: { fullPath: project.full_path, tagName: release.tag })
 
diff --git a/spec/frontend/fixtures/runner.rb b/spec/frontend/fixtures/runner.rb
index b88fb840137..e29a58f43b9 100644
--- a/spec/frontend/fixtures/runner.rb
+++ b/spec/frontend/fixtures/runner.rb
@@ -36,10 +36,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     get_runners_query_name = 'get_runners.query.graphql'
 
     let_it_be(:query) do
-      get_graphql_query_as_string("#{query_path}#{get_runners_query_name}", [
-      'runner/graphql/runner_node.fragment.graphql',
-      'graphql_shared/fragments/pageInfo.fragment.graphql'
-      ])
+      get_graphql_query_as_string("#{query_path}#{get_runners_query_name}")
     end
 
     it "#{fixtures_path}#{get_runners_query_name}.json" do
@@ -59,9 +56,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     get_runner_query_name = 'get_runner.query.graphql'
 
     let_it_be(:query) do
-      get_graphql_query_as_string("#{query_path}#{get_runner_query_name}", [
-      'runner/graphql/runner_details.fragment.graphql'
-      ])
+      get_graphql_query_as_string("#{query_path}#{get_runner_query_name}")
     end
 
     it "#{fixtures_path}#{get_runner_query_name}.json" do