Add latest changes from gitlab-org/gitlab@master

16 files changed, 20 insertions, 20 deletions

diff --git a/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
index fcc717f83a2..51d3c4f5d6b 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
@@ -11,12 +11,12 @@ describe Mutations::ResolvesGroup do
 
   let(:context) { double }
 
-  subject(:mutation) { mutation_class.new(object: nil, context: context) }
+  subject(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
 
   it 'uses the GroupsResolver to resolve groups by path' do
     group = create(:group)
 
-    expect(Resolvers::GroupResolver).to receive(:new).with(object: nil, context: context).and_call_original
+    expect(Resolvers::GroupResolver).to receive(:new).with(object: nil, context: context, field: nil).and_call_original
     expect(mutation.resolve_group(full_path: group.full_path).sync).to eq(group)
   end
 end
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
index 064ad90f707..69db8d016d7 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
@@ -12,7 +12,7 @@ describe Mutations::ResolvesIssuable do
   let(:project)  { create(:project) }
   let(:user)     { create(:user) }
   let(:context)  { { current_user: user } }
-  let(:mutation) { mutation_class.new(object: nil, context: context) }
+  let(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
 
   shared_examples 'resolving an issuable' do |type|
     context 'when user has access' do
@@ -39,7 +39,7 @@ describe Mutations::ResolvesIssuable do
           .and_return(resolved_project)
 
         expect(resolver_class).to receive(:new)
-          .with(object: resolved_project, context: context)
+          .with(object: resolved_project, context: context, field: nil)
           .and_call_original
 
         subject
@@ -47,7 +47,7 @@ describe Mutations::ResolvesIssuable do
 
       it 'uses the ResolvesProject to resolve project' do
         expect(Resolvers::ProjectResolver).to receive(:new)
-          .with(object: nil, context: context)
+          .with(object: nil, context: context, field: nil)
           .and_call_original
 
         subject
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb
index 918e5fb016e..b5c349f6284 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb
@@ -11,12 +11,12 @@ describe Mutations::ResolvesProject do
 
   let(:context) { double }
 
-  subject(:mutation) { mutation_class.new(object: nil, context: context) }
+  subject(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
 
   it 'uses the ProjectsResolver to resolve projects by path' do
     project = create(:project)
 
-    expect(Resolvers::ProjectResolver).to receive(:new).with(object: nil, context: context).and_call_original
+    expect(Resolvers::ProjectResolver).to receive(:new).with(object: nil, context: context, field: nil).and_call_original
     expect(mutation.resolve_project(full_path: project.full_path).sync).to eq(project)
   end
 end
diff --git a/spec/graphql/mutations/issues/set_confidential_spec.rb b/spec/graphql/mutations/issues/set_confidential_spec.rb
index a8f1fcdf7f1..6031953c869 100644
--- a/spec/graphql/mutations/issues/set_confidential_spec.rb
+++ b/spec/graphql/mutations/issues/set_confidential_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::Issues::SetConfidential do
   let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:confidential) { true }
diff --git a/spec/graphql/mutations/issues/set_due_date_spec.rb b/spec/graphql/mutations/issues/set_due_date_spec.rb
index b45a7b460cd..73ba11fc551 100644
--- a/spec/graphql/mutations/issues/set_due_date_spec.rb
+++ b/spec/graphql/mutations/issues/set_due_date_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::Issues::SetDueDate do
   let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:due_date) { 2.days.since }
diff --git a/spec/graphql/mutations/issues/update_spec.rb b/spec/graphql/mutations/issues/update_spec.rb
index 3d671680ccf..83bd3041cbf 100644
--- a/spec/graphql/mutations/issues/update_spec.rb
+++ b/spec/graphql/mutations/issues/update_spec.rb
@@ -13,7 +13,7 @@ describe Mutations::Issues::Update do
       due_date: Date.tomorrow
     }
   end
-  let(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  let(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
   let(:mutated_issue) { subject[:issue] }
 
   describe '#resolve' do
diff --git a/spec/graphql/mutations/merge_requests/set_assignees_spec.rb b/spec/graphql/mutations/merge_requests/set_assignees_spec.rb
index 2033ab57a0d..d88c5db05c9 100644
--- a/spec/graphql/mutations/merge_requests/set_assignees_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_assignees_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::MergeRequests::SetAssignees do
   let(:merge_request) { create(:merge_request) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:assignee) { create(:user) }
diff --git a/spec/graphql/mutations/merge_requests/set_labels_spec.rb b/spec/graphql/mutations/merge_requests/set_labels_spec.rb
index f7c04a57f68..f58f35eb6f3 100644
--- a/spec/graphql/mutations/merge_requests/set_labels_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_labels_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::MergeRequests::SetLabels do
   let(:merge_request) { create(:merge_request) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:label) { create(:label, project: merge_request.project) }
diff --git a/spec/graphql/mutations/merge_requests/set_locked_spec.rb b/spec/graphql/mutations/merge_requests/set_locked_spec.rb
index d35430abff1..12ae1314f22 100644
--- a/spec/graphql/mutations/merge_requests/set_locked_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_locked_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::MergeRequests::SetLocked do
   let(:merge_request) { create(:merge_request) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:locked) { true }
diff --git a/spec/graphql/mutations/merge_requests/set_milestone_spec.rb b/spec/graphql/mutations/merge_requests/set_milestone_spec.rb
index d79b0a995d7..ad7f2df0842 100644
--- a/spec/graphql/mutations/merge_requests/set_milestone_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_milestone_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::MergeRequests::SetMilestone do
   let(:merge_request) { create(:merge_request) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:milestone) { create(:milestone, project: merge_request.project) }
diff --git a/spec/graphql/mutations/merge_requests/set_subscription_spec.rb b/spec/graphql/mutations/merge_requests/set_subscription_spec.rb
index 286de6c0c97..a28bab363f3 100644
--- a/spec/graphql/mutations/merge_requests/set_subscription_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_subscription_spec.rb
@@ -7,7 +7,7 @@ describe Mutations::MergeRequests::SetSubscription do
   let(:project) { merge_request.project }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:subscribe) { true }
diff --git a/spec/graphql/mutations/merge_requests/set_wip_spec.rb b/spec/graphql/mutations/merge_requests/set_wip_spec.rb
index 490994c4577..9f0adcf117a 100644
--- a/spec/graphql/mutations/merge_requests/set_wip_spec.rb
+++ b/spec/graphql/mutations/merge_requests/set_wip_spec.rb
@@ -6,7 +6,7 @@ describe Mutations::MergeRequests::SetWip do
   let(:merge_request) { create(:merge_request) }
   let(:user) { create(:user) }
 
-  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }) }
+  subject(:mutation) { described_class.new(object: nil, context: { current_user: user }, field: nil) }
 
   describe '#resolve' do
     let(:wip) { true }
diff --git a/spec/graphql/mutations/todos/mark_all_done_spec.rb b/spec/graphql/mutations/todos/mark_all_done_spec.rb
index cce69d0dcdc..98b22a3e761 100644
--- a/spec/graphql/mutations/todos/mark_all_done_spec.rb
+++ b/spec/graphql/mutations/todos/mark_all_done_spec.rb
@@ -48,6 +48,6 @@ describe Mutations::Todos::MarkAllDone do
   end
 
   def mutation_for(user)
-    described_class.new(object: nil, context: { current_user: user })
+    described_class.new(object: nil, context: { current_user: user }, field: nil)
   end
 end
diff --git a/spec/graphql/mutations/todos/mark_done_spec.rb b/spec/graphql/mutations/todos/mark_done_spec.rb
index ff61ef76db6..059ef3c8eee 100644
--- a/spec/graphql/mutations/todos/mark_done_spec.rb
+++ b/spec/graphql/mutations/todos/mark_done_spec.rb
@@ -14,7 +14,7 @@ describe Mutations::Todos::MarkDone do
 
   let_it_be(:other_user_todo) { create(:todo, user: other_user, author: author, state: :pending) }
 
-  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }) }
+  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }, field: nil) }
 
   describe '#resolve' do
     it 'marks a single todo as done' do
diff --git a/spec/graphql/mutations/todos/restore_many_spec.rb b/spec/graphql/mutations/todos/restore_many_spec.rb
index 7821ce35a08..8f4a8985f9e 100644
--- a/spec/graphql/mutations/todos/restore_many_spec.rb
+++ b/spec/graphql/mutations/todos/restore_many_spec.rb
@@ -12,7 +12,7 @@ describe Mutations::Todos::RestoreMany do
 
   let_it_be(:other_user_todo) { create(:todo, user: other_user, author: author, state: :done) }
 
-  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }) }
+  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }, field: nil) }
 
   describe '#resolve' do
     it 'restores a single todo' do
diff --git a/spec/graphql/mutations/todos/restore_spec.rb b/spec/graphql/mutations/todos/restore_spec.rb
index 76a2d4ffffd..1637acc2fb5 100644
--- a/spec/graphql/mutations/todos/restore_spec.rb
+++ b/spec/graphql/mutations/todos/restore_spec.rb
@@ -12,7 +12,7 @@ describe Mutations::Todos::Restore do
 
   let_it_be(:other_user_todo) { create(:todo, user: other_user, author: author, state: :done) }
 
-  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }) }
+  let(:mutation) { described_class.new(object: nil, context: { current_user: current_user }, field: nil) }
 
   describe '#resolve' do
     it 'restores a single todo' do