Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/frontend/fixtures/timezones.rb b/spec/frontend/fixtures/timezones.rb
new file mode 100644
index 00000000000..261dcf5e116
--- /dev/null
+++ b/spec/frontend/fixtures/timezones.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe TimeZoneHelper, '(JavaScript fixtures)' do
+  include JavaScriptFixturesHelpers
+  include TimeZoneHelper
+
+  let(:response) { @timezones.sort_by! { |tz| tz[:name] }.to_json }
+
+  before(:all) do
+    clean_frontend_fixtures('timezones/')
+  end
+
+  it 'timezones/short.json' do
+    @timezones = timezone_data(format: :short)
+  end
+
+  it 'timezones/full.json' do
+    @timezones = timezone_data(format: :full)
+  end
+end