Commit f2ad2fd4 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '356122-broken-foss-master-in-rspec-all-frontend_fixture' into 'master'

Move EE-specific frontend fixture to ee/spec/

See merge request gitlab-org/gitlab!83079
parents 331ef5b1 dbbd09c9
...@@ -140,7 +140,7 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: ...@@ -140,7 +140,7 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type:
query_name = 'ready_to_merge.query.graphql' query_name = 'ready_to_merge.query.graphql'
it "#{base_output_path}#{query_name}.json" do it "#{base_output_path}#{query_name}.json" do
query = get_graphql_query_as_string("#{base_input_path}#{query_name}", ee: true) query = get_graphql_query_as_string("#{base_input_path}#{query_name}", ee: Gitlab.ee?)
post_graphql(query, current_user: user, variables: { projectPath: project.full_path, iid: merge_request.iid.to_s }) post_graphql(query, current_user: user, variables: { projectPath: project.full_path, iid: merge_request.iid.to_s })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment