Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/frontend/access_tokens/components/expires_at_field_spec.js b/spec/frontend/access_tokens/components/expires_at_field_spec.js
index 646dc0d703f..491d2a0e323 100644
--- a/spec/frontend/access_tokens/components/expires_at_field_spec.js
+++ b/spec/frontend/access_tokens/components/expires_at_field_spec.js
@@ -58,4 +58,20 @@ describe('~/access_tokens/components/expires_at_field', () => {
 
     expect(findDatepicker().props('defaultDate')).toStrictEqual(future);
   });
+
+  it('should set the default expiration date to be 365 days', () => {
+    const offset = 365;
+    const today = new Date();
+    const future = getDateInFuture(today, offset);
+    createComponent({ defaultDateOffset: offset });
+
+    expect(findDatepicker().props('defaultDate')).toStrictEqual(future);
+  });
+
+  it('should set the default expiration date to maxDate, ignoring defaultDateOffset', () => {
+    const maxDate = new Date();
+    createComponent({ maxDate, defaultDateOffset: 2 });
+
+    expect(findDatepicker().props('defaultDate')).toStrictEqual(maxDate);
+  });
 });