Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 6 deletions

diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 6109b40eee2..1de6b6e3e98 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -618,7 +618,7 @@ describe('Dashboard', () => {
           findRearrangeButton().vm.$emit('click');
           await nextTick();
 
-          expect(findRearrangeButton().attributes('pressed')).toBeTruthy();
+          expect(findRearrangeButton().attributes('pressed')).toBe('true');
           expect(findEnabledDraggables().wrappers).toEqual(findDraggables().wrappers);
         });
 
@@ -662,7 +662,7 @@ describe('Dashboard', () => {
 
           findRearrangeButton().vm.$emit('click');
           await nextTick();
-          expect(findRearrangeButton().attributes('pressed')).toBeFalsy();
+          expect(findRearrangeButton().attributes('pressed')).toBeUndefined();
           expect(findEnabledDraggables().length).toBe(0);
         });
       });
diff --git a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
index 721992e710a..3ccaa2d28ac 100644
--- a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
+++ b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
@@ -163,9 +163,6 @@ describe('DashboardsDropdown', () => {
       findItemAt(1).vm.$emit('click');
     });
 
-    it('emits a "selectDashboard" event', () => {
-      expect(wrapper.emitted().selectDashboard).toBeTruthy();
-    });
     it('emits a "selectDashboard" event with dashboard information', () => {
       expect(wrapper.emitted().selectDashboard[0]).toEqual([dashboardGitResponse[0]]);
     });
diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
index 755204dc721..b54ca926dae 100644
--- a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
+++ b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
@@ -68,7 +68,7 @@ describe('DuplicateDashboardForm', () => {
       await nextTick();
 
       expect(findByRef('fileNameFormGroup').classes()).toContain('is-invalid');
-      expect(findInvalidFeedback().text()).toBeTruthy();
+      expect(findInvalidFeedback().text()).toBe('The file name should have a .yml extension');
     });
   });