Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 10 insertions, 6 deletions

diff --git a/spec/frontend/admin/users/components/user_date_spec.js b/spec/frontend/admin/users/components/user_date_spec.js
index 1a2f2938db5..af262c6d3f0 100644
--- a/spec/frontend/admin/users/components/user_date_spec.js
+++ b/spec/frontend/admin/users/components/user_date_spec.js
@@ -1,6 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 
 import UserDate from '~/vue_shared/components/user_date.vue';
+import { ISO_SHORT_FORMAT } from '~/vue_shared/constants';
 import { users } from '../mock_data';
 
 const mockDate = users[0].createdAt;
@@ -22,12 +23,15 @@ describe('FormatDate component', () => {
   });
 
   it.each`
-    date         | output
-    ${mockDate}  | ${'13 Nov, 2020'}
-    ${null}      | ${'Never'}
-    ${undefined} | ${'Never'}
-  `('renders $date as $output', ({ date, output }) => {
-    initComponent({ date });
+    date         | dateFormat          | output
+    ${mockDate}  | ${undefined}        | ${'13 Nov, 2020'}
+    ${null}      | ${undefined}        | ${'Never'}
+    ${undefined} | ${undefined}        | ${'Never'}
+    ${mockDate}  | ${ISO_SHORT_FORMAT} | ${'2020-11-13'}
+    ${null}      | ${ISO_SHORT_FORMAT} | ${'Never'}
+    ${undefined} | ${ISO_SHORT_FORMAT} | ${'Never'}
+  `('renders $date as $output', ({ date, dateFormat, output }) => {
+    initComponent({ date, dateFormat });
 
     expect(wrapper.text()).toBe(output);
   });