1 files changed, 4 insertions, 13 deletions

diff --git a/spec/graphql/mutations/discussions/toggle_resolve_spec.rb b/spec/graphql/mutations/discussions/toggle_resolve_spec.rb
index 2041b86d6e7..3f7347798e5 100644
--- a/spec/graphql/mutations/discussions/toggle_resolve_spec.rb
+++ b/spec/graphql/mutations/discussions/toggle_resolve_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Mutations::Discussions::ToggleResolve do
+  include GraphqlHelpers
+
   subject(:mutation) do
     described_class.new(object: nil, context: { current_user: user }, field: nil)
   end
@@ -15,7 +17,7 @@ RSpec.describe Mutations::Discussions::ToggleResolve do
       mutation.resolve(id: id_arg, resolve: resolve_arg)
     end
 
-    let(:id_arg) { discussion.to_global_id.to_s }
+    let(:id_arg) { global_id_of(discussion) }
     let(:resolve_arg) { true }
     let(:mutated_discussion) { subject[:discussion] }
     let(:errors) { subject[:errors] }
@@ -36,7 +38,7 @@ RSpec.describe Mutations::Discussions::ToggleResolve do
         let_it_be(:user) { create(:user, developer_projects: [project]) }
 
         context 'when discussion cannot be found' do
-          let(:id_arg) { "#{discussion.to_global_id}foo" }
+          let(:id_arg) { global_id_of(id: non_existing_record_id, model_name: discussion.class.name) }
 
           it 'raises an error' do
             expect { subject }.to raise_error(
@@ -46,17 +48,6 @@ RSpec.describe Mutations::Discussions::ToggleResolve do
           end
         end
 
-        context 'when discussion is not a Discussion' do
-          let(:discussion) { create(:note, noteable: noteable, project: project) }
-
-          it 'raises an error' do
-            expect { subject }.to raise_error(
-              GraphQL::CoercionError,
-              "\"#{discussion.to_global_id}\" does not represent an instance of Discussion"
-            )
-          end
-        end
-
         shared_examples 'returns a resolved discussion without errors' do
           it 'returns a resolved discussion' do
             expect(mutated_discussion).to be_resolved