Display timezone name not identifier

2 files changed, 6 insertions, 4 deletions

diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index a53da94ef7d..15b78eb6d23 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -341,17 +341,19 @@ describe 'User edit profile' do
       end
 
       it 'allows the user to select a time zone from a dropdown list of options' do
+        selected_tz = "Nuku'alofa"
+
         expect(page.find('.user-time-preferences .dropdown')).not_to have_css('.show')
 
         page.find('.user-time-preferences .js-timezone-dropdown').click
 
         expect(page.find('.user-time-preferences .dropdown')).to have_css('.show')
 
-        page.find("a", text: "Nuku'alofa").click
+        page.find("a", text: selected_tz).click
 
         tz = page.find('.user-time-preferences #user_timezone', visible: false)
 
-        expect(tz.value).to eq('Pacific/Tongatapu')
+        expect(tz.value).to eq(selected_tz)
       end
 
       it 'timezone defaults to servers default' do
diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index 9384287f98a..bdb154d8df3 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -14,10 +14,10 @@ describe Users::UpdateService do
     end
 
     it 'updates time preferences' do
-      result = update_user(user, timezone: 'Europe/Warsaw', time_display_relative: true, time_format_in_24h: false)
+      result = update_user(user, timezone: 'Warsaw', time_display_relative: true, time_format_in_24h: false)
 
       expect(result).to eq(status: :success)
-      expect(user.reload.timezone).to eq('Europe/Warsaw')
+      expect(user.reload.timezone).to eq('Warsaw')
       expect(user.time_display_relative).to eq(true)
       expect(user.time_format_in_24h).to eq(false)
     end