Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e52f31cd
Commit
e52f31cd
authored
Nov 10, 2021
by
mehulsharma
Committed by
Mehul Sharma
Nov 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix OpenStruct use
Fixes OpenStruct in accept_spec since Ruby 3 discourages it Changelog: changed
parent
81b4cccb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-1
ee/spec/graphql/mutations/merge_requests/accept_spec.rb
ee/spec/graphql/mutations/merge_requests/accept_spec.rb
+3
-2
No files found.
.rubocop_manual_todo.yml
View file @
e52f31cd
...
@@ -2561,7 +2561,6 @@ Style/OpenStructUse:
...
@@ -2561,7 +2561,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/billing_plans_helper_spec.rb'
-
'
ee/spec/helpers/billing_plans_helper_spec.rb'
-
'
ee/spec/helpers/ee/blob_helper_spec.rb'
-
'
ee/spec/helpers/ee/blob_helper_spec.rb'
...
...
ee/spec/graphql/mutations/merge_requests/accept_spec.rb
View file @
e52f31cd
...
@@ -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
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment