1 files changed, 9 insertions, 12 deletions
diff --git a/spec/requests/api/graphql/packages/conan_spec.rb b/spec/requests/api/graphql/packages/conan_spec.rb
index 84c5af33e5d..1f3732980d9 100644
--- a/spec/requests/api/graphql/packages/conan_spec.rb
+++ b/spec/requests/api/graphql/packages/conan_spec.rb
@@ -37,22 +37,19 @@ RSpec.describe 'conan package details' do
   it_behaves_like 'a package with files'
 
   it 'has the correct metadata' do
-    expect(metadata_response).to include(
-      'id' => global_id_of(package.conan_metadatum),
-      'recipe' => package.conan_metadatum.recipe,
-      'packageChannel' => package.conan_metadatum.package_channel,
-      'packageUsername' => package.conan_metadatum.package_username,
-      'recipePath' => package.conan_metadatum.recipe_path
+    expect(metadata_response).to match(
+      a_graphql_entity_for(package.conan_metadatum,
+                           :recipe, :package_channel, :package_username, :recipe_path)
     )
   end
 
   it 'has the correct file metadata' do
-    expect(first_file_response_metadata).to include(
-      'id' =>  global_id_of(first_file.conan_file_metadatum),
-      'packageRevision' => first_file.conan_file_metadatum.package_revision,
-      'conanPackageReference' => first_file.conan_file_metadatum.conan_package_reference,
-      'recipeRevision' => first_file.conan_file_metadatum.recipe_revision,
-      'conanFileType' => first_file.conan_file_metadatum.conan_file_type.upcase
+    expect(first_file_response_metadata).to match(
+      a_graphql_entity_for(
+        first_file.conan_file_metadatum,
+        :package_revision, :conan_package_reference, :recipe_revision,
+        conan_file_type: first_file.conan_file_metadatum.conan_file_type.upcase
+      )
     )
   end
 end