Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/graphql/types/custom_emoji_type_spec.rb b/spec/graphql/types/custom_emoji_type_spec.rb
index 7f3c99e4b63..17697321602 100644
--- a/spec/graphql/types/custom_emoji_type_spec.rb
+++ b/spec/graphql/types/custom_emoji_type_spec.rb
@@ -3,9 +3,20 @@
 require 'spec_helper'
 
 RSpec.describe GitlabSchema.types['CustomEmoji'] do
+  expected_fields = %w[
+    id
+    name
+    url
+    external
+    created_at
+    user_permissions
+  ]
+
   specify { expect(described_class.graphql_name).to eq('CustomEmoji') }
 
   specify { expect(described_class).to require_graphql_authorizations(:read_custom_emoji) }
 
-  specify { expect(described_class).to have_graphql_fields(:id, :name, :url, :external) }
+  specify { expect(described_class).to have_graphql_fields(*expected_fields) }
+
+  specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::CustomEmoji) }
 end