Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 07ca362a450..83afeb77bad 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe UsersHelper do
   include TermsHelper
 
-  let(:user) { create(:user) }
+  let_it_be(:user) { create(:user, timezone: ActiveSupport::TimeZone::MAPPING['UTC']) }
 
   def filter_ee_badges(badges)
     badges.reject { |badge| badge[:text] == 'Is using seat' }
@@ -478,4 +478,17 @@ RSpec.describe UsersHelper do
       end
     end
   end
+
+  describe '#user_profile_tabs_app_data' do
+    before do
+      allow(helper).to receive(:user_calendar_path).with(user, :json).and_return('/users/root/calendar.json')
+    end
+
+    it 'returns expected hash' do
+      expect(helper.user_profile_tabs_app_data(user)).to eq({
+        user_calendar_path: '/users/root/calendar.json',
+        utc_offset: 0
+      })
+    end
+  end
 end