From e3063c083a8a0cc11c243befe87a6cf66ba55949 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 5 May 2021 16:14:51 +0200 Subject: [PATCH] Update test cases --- .../js/components/DatePicker/DatePicker.js | 3 +- .../DatePicker/tests/DatePicker.test.js | 13 +- .../__snapshots__/DatePicker.test.js.snap | 168 ++++++++++++++++++ 3 files changed, 176 insertions(+), 8 deletions(-) diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/DatePicker.js b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/DatePicker.js index 9f236761676..dcfd706ed6a 100644 --- a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/DatePicker.js +++ b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/DatePicker.js @@ -86,7 +86,7 @@ class DatePicker extends React.Component { if ( (!this.value && date) || (this.value && !date) || - !moment(this.value).isSame(date, 'day') + !moment(this.value, this.getFormat()).isSame(moment(date, this.getFormat()), 'day') ) { this.setOpen(false); } @@ -189,7 +189,6 @@ class DatePicker extends React.Component { const {className, disabled, options, placeholder, valid} = this.props; const fieldOptions = { - closeOnSelect: true, ...options, dateFormat: this.getDateFormat() || false, timeFormat: this.getTimeFormat() || false, diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/DatePicker.test.js b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/DatePicker.test.js index 6ef80faf834..efe5e82aa53 100644 --- a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/DatePicker.test.js +++ b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/DatePicker.test.js @@ -17,7 +17,8 @@ test('DatePicker should render', () => { const datePicker = mount(); expect(datePicker.render()).toMatchSnapshot(); - expect(datePicker.find('DateTime').render()).toMatchSnapshot(); + + expect(datePicker.find(ReactDatetime).render()).toMatchSnapshot(); }); test('DatePicker should show disabled Input when disabled', () => { @@ -40,18 +41,18 @@ test('DatePicker should open overlay on icon-click', () => { const onChange = jest.fn(); const datePicker = mount(); - expect(datePicker.find('DateTime').props().open).toBeFalsy(); + expect(datePicker.find(ReactDatetime).props().open).toBeFalsy(); datePicker.find('Icon').simulate('click'); - expect(datePicker.find('DateTime').props().open).toBeTruthy(); + expect(datePicker.find(ReactDatetime).props().open).toBeTruthy(); }); test('DatePicker should not open overlay on icon-click when disabled', () => { const onChange = jest.fn(); const datePicker = mount(); - expect(datePicker.find('DateTime').props().open).toBeFalsy(); + expect(datePicker.find(ReactDatetime).props().open).toBeFalsy(); datePicker.find('Icon').simulate('click'); - expect(datePicker.find('DateTime').props().open).toBeFalsy(); + expect(datePicker.find(ReactDatetime).props().open).toBeFalsy(); }); test('DatePicker should render with placeholder', () => { @@ -132,7 +133,7 @@ test('DatePicker should render date picker with time picker', () => { const datePicker = mount(); expect(datePicker.render()).toMatchSnapshot(); - expect(datePicker.find('DateTime').render()).toMatchSnapshot(); + expect(datePicker.find(ReactDatetime).render()).toMatchSnapshot(); }); test('DatePicker should render error', () => { diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/__snapshots__/DatePicker.test.js.snap b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/__snapshots__/DatePicker.test.js.snap index d10145942b5..9f6b7b9e039 100644 --- a/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/__snapshots__/DatePicker.test.js.snap +++ b/src/Sulu/Bundle/AdminBundle/Resources/js/components/DatePicker/tests/__snapshots__/DatePicker.test.js.snap @@ -106,43 +106,57 @@ exports[`DatePicker should render 2`] = ` 26 27 28 29 30 31 1 @@ -150,43 +164,57 @@ exports[`DatePicker should render 2`] = ` 2 3 4 5 6 7 8 @@ -194,43 +222,57 @@ exports[`DatePicker should render 2`] = ` 9 10 11 12 13 14 15 @@ -238,43 +280,57 @@ exports[`DatePicker should render 2`] = ` 16 17 18 19 20 21 22 @@ -282,43 +338,57 @@ exports[`DatePicker should render 2`] = ` 23 24 25 26 27 28 29 @@ -326,43 +396,57 @@ exports[`DatePicker should render 2`] = ` 30 1 2 3 4 5 6 @@ -530,43 +614,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 26 27 28 29 30 31 1 @@ -574,43 +672,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 2 3 4 5 6 7 8 @@ -618,43 +730,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 9 10 11 12 13 14 15 @@ -662,43 +788,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 16 17 18 19 20 21 22 @@ -706,43 +846,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 23 24 25 26 27 28 29 @@ -750,43 +904,57 @@ exports[`DatePicker should render date picker with time picker 2`] = ` 30 1 2 3 4 5 6