Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/graphql/types/release_asset_link_type_spec.rb b/spec/graphql/types/release_asset_link_type_spec.rb
index 6800d5459c4..0c903b8d27a 100644
--- a/spec/graphql/types/release_asset_link_type_spec.rb
+++ b/spec/graphql/types/release_asset_link_type_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe GitlabSchema.types['ReleaseAssetLink'] do
 
   it 'has the expected fields' do
     expected_fields = %w[
-      id name url external link_type direct_asset_url
+      id name url external link_type direct_asset_url direct_asset_path
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/snippets/blob_type_spec.rb b/spec/graphql/types/snippets/blob_type_spec.rb
index 60c0db8e551..e20b001ba7f 100644
--- a/spec/graphql/types/snippets/blob_type_spec.rb
+++ b/spec/graphql/types/snippets/blob_type_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe GitlabSchema.types['SnippetBlob'] do
   include GraphqlHelpers
 
   it 'has the correct fields' do
-    expected_fields = [:rich_data, :plain_data,
+    expected_fields = [:rich_data, :plain_data, :raw_plain_data,
                        :raw_path, :size, :binary, :name, :path,
                        :simple_viewer, :rich_viewer, :mode, :external_storage,
                        :rendered_as_text]
@@ -18,6 +18,7 @@ RSpec.describe GitlabSchema.types['SnippetBlob'] do
     {
       'richData' => be_nullable,
       'plainData' => be_nullable,
+      'rawPlainData' => be_nullable,
       'rawPath' => be_non_null,
       'size' => be_non_null,
       'binary' => be_non_null,