Add latest changes from gitlab-org/gitlab@13-0-stable-ee

2 files changed, 19 insertions, 6 deletions

diff --git a/spec/lib/gitlab/graphql/authorize/authorize_field_service_spec.rb b/spec/lib/gitlab/graphql/authorize/authorize_field_service_spec.rb
index 98659dbed57..c1dab5feb91 100644
--- a/spec/lib/gitlab/graphql/authorize/authorize_field_service_spec.rb
+++ b/spec/lib/gitlab/graphql/authorize/authorize_field_service_spec.rb
@@ -84,6 +84,16 @@ describe Gitlab::Graphql::Authorize::AuthorizeFieldService do
       end
     end
 
+    context 'when the field is a connection' do
+      context 'when it resolves to nil' do
+        let(:field) { type_with_field(Types::QueryType.connection_type, :read_field, nil).fields['testField'].to_graphql }
+
+        it 'does not fail when authorizing' do
+          expect(resolved).to be_nil
+        end
+      end
+    end
+
     context 'when the field is a specific type' do
       let(:custom_type) { type(:read_type) }
       let(:object_in_field) { double('presented in field') }
diff --git a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
index fdacecbaca6..ba77bc95bb5 100644
--- a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
+++ b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
@@ -9,6 +9,14 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
   let(:schema) { GraphQL::Schema.define(query: query_type, mutation: nil)}
   let(:context) { GraphQL::Query::Context.new(query: OpenStruct.new(schema: schema), values: nil, object: nil) }
 
+  before do
+    stub_const('NoPrimaryKey', Class.new(ActiveRecord::Base))
+    NoPrimaryKey.class_eval do
+      self.table_name  = 'no_primary_key'
+      self.primary_key = nil
+    end
+  end
+
   subject(:connection) do
     described_class.new(nodes, { context: context, max_page_size: 3 }.merge(arguments))
   end
@@ -18,7 +26,7 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
   end
 
   def decoded_cursor(cursor)
-    JSON.parse(Base64Bp.urlsafe_decode64(cursor))
+    Gitlab::Json.parse(Base64Bp.urlsafe_decode64(cursor))
   end
 
   describe '#cursor_for' do
@@ -303,9 +311,4 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
       end
     end
   end
-
-  class NoPrimaryKey < ActiveRecord::Base
-    self.table_name  = 'no_primary_key'
-    self.primary_key = nil
-  end
 end