Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/models/project_metrics_setting_spec.rb b/spec/models/project_metrics_setting_spec.rb
index 7df01625ba1..c6f668a11bc 100644
--- a/spec/models/project_metrics_setting_spec.rb
+++ b/spec/models/project_metrics_setting_spec.rb
@@ -44,12 +44,12 @@ describe ProjectMetricsSetting do
       it { is_expected.to be_valid }
     end
 
-    context 'external_dashboard_url is blank' do
-      before do
-        subject.external_dashboard_url = ''
-      end
+    context 'dashboard_timezone' do
+      it { is_expected.to define_enum_for(:dashboard_timezone).with_values({ local: 0, utc: 1 }) }
 
-      it { is_expected.to be_invalid }
+      it 'defaults to local' do
+        expect(subject.dashboard_timezone).to eq('local')
+      end
     end
   end
 end