Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 1 deletions

diff --git a/spec/graphql/resolvers/metadata_resolver_spec.rb b/spec/graphql/resolvers/metadata_resolver_spec.rb
index f8c01f9d531..56875e185e7 100644
--- a/spec/graphql/resolvers/metadata_resolver_spec.rb
+++ b/spec/graphql/resolvers/metadata_resolver_spec.rb
@@ -7,7 +7,10 @@ RSpec.describe Resolvers::MetadataResolver do
 
   describe '#resolve' do
     it 'returns version and revision' do
-      expect(resolve(described_class)).to have_attributes(version: Gitlab::VERSION, revision: Gitlab.revision)
+      expect(resolve(described_class)).to have_attributes(
+        version: Gitlab::VERSION,
+        revision: Gitlab.revision,
+        kas: kind_of(InstanceMetadata::Kas))
     end
   end
 end
diff --git a/spec/graphql/types/metadata/kas_type_spec.rb b/spec/graphql/types/metadata/kas_type_spec.rb
new file mode 100644
index 00000000000..f90c64f0068
--- /dev/null
+++ b/spec/graphql/types/metadata/kas_type_spec.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GitlabSchema.types['Kas'] do
+  specify { expect(described_class.graphql_name).to eq('Kas') }
+  specify { expect(described_class).to require_graphql_authorizations(:read_instance_metadata) }
+end