Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/monitoring/components/charts/column_spec.js b/spec/frontend/monitoring/components/charts/column_spec.js
index 89739a7485d..a2056d96dcf 100644
--- a/spec/frontend/monitoring/components/charts/column_spec.js
+++ b/spec/frontend/monitoring/components/charts/column_spec.js
@@ -63,8 +63,8 @@ describe('Column component', () => {
       return formatter(date);
     };
 
-    it('x-axis is formatted correctly in AM/PM format', () => {
-      expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+    it('x-axis is formatted correctly in m/d h:MM TT format', () => {
+      expect(useXAxisFormatter(mockDate)).toEqual('5/26 8:00 PM');
     });
 
     describe('when in PT timezone', () => {
@@ -78,17 +78,17 @@ describe('Column component', () => {
 
       it('by default, values are formatted in PT', () => {
         createWrapper();
-        expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+        expect(useXAxisFormatter(mockDate)).toEqual('5/26 1:00 PM');
       });
 
       it('when the chart uses local timezone, y-axis is formatted in PT', () => {
         createWrapper({ timezone: 'LOCAL' });
-        expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+        expect(useXAxisFormatter(mockDate)).toEqual('5/26 1:00 PM');
       });
 
       it('when the chart uses UTC, y-axis is formatted in UTC', () => {
         createWrapper({ timezone: 'UTC' });
-        expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+        expect(useXAxisFormatter(mockDate)).toEqual('5/26 8:00 PM');
       });
     });
   });