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

1 files changed, 3 insertions, 9 deletions

diff --git a/spec/graphql/mutations/release_asset_links/delete_spec.rb b/spec/graphql/mutations/release_asset_links/delete_spec.rb
index cda292f2ffa..cca7bd2ba38 100644
--- a/spec/graphql/mutations/release_asset_links/delete_spec.rb
+++ b/spec/graphql/mutations/release_asset_links/delete_spec.rb
@@ -52,18 +52,12 @@ RSpec.describe Mutations::ReleaseAssetLinks::Delete do
       end
 
       context "when the link doesn't exist" do
-        let(:mutation_arguments) { super().merge(id: "gid://gitlab/Releases::Link/#{non_existing_record_id}") }
-
-        it 'raises an error' do
-          expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+        let(:mutation_arguments) do
+          super().merge(id: global_id_of(id: non_existing_record_id, model_name: release_link.class.name))
         end
-      end
-
-      context "when the provided ID is invalid" do
-        let(:mutation_arguments) { super().merge(id: 'not-a-valid-gid') }
 
         it 'raises an error' do
-          expect { subject }.to raise_error(::GraphQL::CoercionError)
+          expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
         end
       end
     end