Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 2 insertions, 7 deletions

diff --git a/spec/support/matchers/graphql_matchers.rb b/spec/support/matchers/graphql_matchers.rb
index 3ba88c3ae71..e6d820104be 100644
--- a/spec/support/matchers/graphql_matchers.rb
+++ b/spec/support/matchers/graphql_matchers.rb
@@ -211,18 +211,13 @@ end
 
 RSpec::Matchers.define :have_graphql_resolver do |expected|
   match do |field|
-    case expected
-    when Method
-      expect(field.type_class.resolve_proc).to eq(expected)
-    else
-      expect(field.type_class.resolver).to eq(expected)
-    end
+    expect(field.resolver).to eq(expected)
   end
 end
 
 RSpec::Matchers.define :have_graphql_extension do |expected|
   match do |field|
-    expect(field.type_class.extensions).to include(expected)
+    expect(field.extensions).to include(expected)
   end
 end