Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 8 deletions

diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index fe167a6ae3e..0bd5043d855 100644
--- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -5,16 +5,13 @@ require 'spec_helper'
 describe Resolvers::MergeRequestsResolver do
   include GraphqlHelpers
 
-  set(:project) { create(:project, :repository) }
-  set(:merge_request_1) { create(:merge_request, :simple, source_project: project, target_project: project) }
-  set(:merge_request_2) { create(:merge_request, :rebased, source_project: project, target_project: project) }
-
-  set(:other_project) { create(:project, :repository) }
-  set(:other_merge_request) { create(:merge_request, source_project: other_project, target_project: other_project) }
-
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:merge_request_1) { create(:merge_request, :simple, source_project: project, target_project: project) }
+  let_it_be(:merge_request_2) { create(:merge_request, :rebased, source_project: project, target_project: project) }
+  let_it_be(:other_project) { create(:project, :repository) }
+  let_it_be(:other_merge_request) { create(:merge_request, source_project: other_project, target_project: other_project) }
   let(:iid_1) { merge_request_1.iid }
   let(:iid_2) { merge_request_2.iid }
-
   let(:other_iid) { other_merge_request.iid }
 
   describe '#resolve' do