Commit 19bb7fb5 authored by James Fargher's avatar James Fargher

Merge branch '344279-accept-openstruct-fix' into 'master'

Fix OpenStruct use in accept_spec

See merge request gitlab-org/gitlab!74192
parents 3beb188e e52f31cd
...@@ -2556,7 +2556,6 @@ Style/OpenStructUse: ...@@ -2556,7 +2556,6 @@ Style/OpenStructUse:
- 'ee/spec/features/projects/new_project_spec.rb' - 'ee/spec/features/projects/new_project_spec.rb'
- 'ee/spec/finders/template_finder_spec.rb' - 'ee/spec/finders/template_finder_spec.rb'
- 'ee/spec/graphql/ee/resolvers/board_lists_resolver_spec.rb' - 'ee/spec/graphql/ee/resolvers/board_lists_resolver_spec.rb'
- 'ee/spec/graphql/mutations/merge_requests/accept_spec.rb'
- 'ee/spec/graphql/resolvers/board_groupings/epics_resolvers_spec.rb' - 'ee/spec/graphql/resolvers/board_groupings/epics_resolvers_spec.rb'
- 'ee/spec/helpers/ee/blob_helper_spec.rb' - 'ee/spec/helpers/ee/blob_helper_spec.rb'
- 'ee/spec/lib/gitlab/auth/group_saml/failure_handler_spec.rb' - 'ee/spec/lib/gitlab/auth/group_saml/failure_handler_spec.rb'
......
...@@ -4,13 +4,14 @@ require 'spec_helper' ...@@ -4,13 +4,14 @@ require 'spec_helper'
RSpec.describe Mutations::MergeRequests::Accept do RSpec.describe Mutations::MergeRequests::Accept do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
subject(:mutation) { described_class.new(context: context, object: nil, field: nil) } subject(:mutation) { described_class.new(context: context, object: nil, field: nil) }
let_it_be(:context) do let(:context) do
GraphQL::Query::Context.new( GraphQL::Query::Context.new(
query: OpenStruct.new(schema: GitlabSchema), query: double('query', schema: GitlabSchema),
values: { current_user: user }, values: { current_user: user },
object: nil object: nil
) )
......
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