summaryrefslogtreecommitdiff
path: root/spec/support/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 12:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 12:09:06 +0000
commit0045970352e8729b2797591beb88a7df884d84f4 (patch)
treeb9cd4c5aaaa26ce4a3c944ec5cfdbd7ad44b796d /spec/support/helpers
parent613868af23d7c0e09210857518895edd6678f5e9 (diff)
downloadgitlab-ce-0045970352e8729b2797591beb88a7df884d84f4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers')
-rw-r--r--spec/support/helpers/javascript_fixtures_helpers.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb
index 403456fa48e..417bf4366c5 100644
--- a/spec/support/helpers/javascript_fixtures_helpers.rb
+++ b/spec/support/helpers/javascript_fixtures_helpers.rb
@@ -46,9 +46,8 @@ module JavaScriptFixturesHelpers
#
# query_path - file path to the GraphQL query, relative to `app/assets/javascripts`.
# ee - boolean, when true `query_path` will be looked up in `/ee`.
- def get_graphql_query_as_string(query_path, ee: false)
- base = (ee ? 'ee/' : '') + 'app/assets/javascripts'
-
+ def get_graphql_query_as_string(query_path, ee: false, with_base_path: true)
+ base = (ee ? 'ee/' : '') + (with_base_path ? 'app/assets/javascripts' : '')
path = Rails.root / base / query_path
queries = Gitlab::Graphql::Queries.find(path)
if queries.length == 1