Resolve EE-specific BlocksJsonSerialization test failures

ee/app/views/projects/issues/service_desk.html.haml

@@ -12,7 +12,7 @@
 - content_for :breadcrumbs_extra do
   = render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false
 
-- support_bot_attrs = User.support_bot.to_json(only: [:id, :name, :username, :avatar_url])
+- support_bot_attrs = UserSerializer.new.represent(User.support_bot).to_json
 
 %div{ class: "#{container_class} js-service-desk-issues service-desk-issues", data: { support_bot: support_bot_attrs } }
   .top-area

spec/ee/spec/lib/gitlab/geo/oauth_session_spec.rb

@@ -7,7 +7,6 @@ describe Gitlab::Geo::OauthSession do
   let(:dummy_state) { 'salt:hmac:return_to' }
   let(:valid_state) { described_class.new(return_to: oauth_return_to).generate_oauth_state }
   let(:access_token) { FactoryBot.create(:doorkeeper_access_token).token }
-  let(:user) { FactoryBot.build(:user) }
 
   before do
     allow(subject).to receive(:oauth_app) { oauth_app }
@@ -122,7 +121,7 @@ describe Gitlab::Geo::OauthSession do
     context 'on success' do
       it 'returns hashed user data' do
         allow(response).to receive(:status) { 200 }
-        allow(response).to receive(:parsed) { user.to_json }
+        allow(response).to receive(:parsed) { attributes_for(:user) }
 
         subject.authenticate_with_gitlab(access_token)
       end