Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 8 insertions, 3 deletions

diff --git a/spec/frontend/operation_settings/components/metrics_settings_spec.js b/spec/frontend/operation_settings/components/metrics_settings_spec.js
index c1fa1d24a82..21145466016 100644
--- a/spec/frontend/operation_settings/components/metrics_settings_spec.js
+++ b/spec/frontend/operation_settings/components/metrics_settings_spec.js
@@ -105,7 +105,10 @@ describe('operation settings external dashboard component', () => {
 
         it('uses description text', () => {
           const description = formGroup.find('small');
-          expect(description.text()).not.toBeFalsy();
+          const expectedDescription =
+            "Choose whether to display dashboard metrics in UTC or the user's local timezone.";
+
+          expect(description.text()).toBe(expectedDescription);
         });
       });
 
@@ -138,7 +141,10 @@ describe('operation settings external dashboard component', () => {
 
         it('uses description text', () => {
           const description = formGroup.find('small');
-          expect(description.text()).not.toBeFalsy();
+          const expectedDescription =
+            'Add a button to the metrics dashboard linking directly to your existing external dashboard.';
+
+          expect(description.text()).toBe(expectedDescription);
         });
       });
 
@@ -151,7 +157,6 @@ describe('operation settings external dashboard component', () => {
         });
 
         it('defaults to externalDashboardUrl', () => {
-          expect(input.attributes().value).toBeTruthy();
           expect(input.attributes().value).toBe(externalDashboardUrl);
         });