Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[test] Remove skip on Edge #1708

Merged
merged 4 commits into from
May 21, 2021
Merged

[test] Remove skip on Edge #1708

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78228ac
remove skip
m4theushw May 19, 2021
d41bb26
use UTC dates for everything
m4theushw May 19, 2021
4b7551c
prefer Intl.DateTimeFormat
m4theushw May 19, 2021
00a5b7f
use toLocaleDateString with locale
m4theushw May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions packages/grid/data-grid/src/tests/filtering.DataGrid.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,38 +189,30 @@ describe('<DataGrid /> - Filter', () => {

describe('date operators', () => {
[
{ operator: 'is', value: new Date(2000, 11, 1), expected: ['2000-12-01'] },
{ operator: 'not', value: new Date(2000, 11, 1), expected: ['2001-01-01', '2002-01-01'] },
{ operator: 'after', value: new Date(2001, 0, 1), expected: ['2002-01-01'] },
{
operator: 'onOrAfter',
value: new Date(2001, 0, 1),
expected: ['2001-01-01', '2002-01-01'],
},
{ operator: 'before', value: new Date(2001, 0, 1), expected: ['2000-12-01'] },
{
operator: 'onOrBefore',
value: new Date(2001, 0, 1),
expected: ['2000-12-01', '2001-01-01'],
},
{ operator: 'is', value: '2000-12-01', expected: ['2000-12-01'] },
{ operator: 'not', value: '2000-12-01', expected: ['2001-01-01', '2002-01-01'] },
{ operator: 'after', value: '2001-01-01', expected: ['2002-01-01'] },
{ operator: 'onOrAfter', value: '2001-01-01', expected: ['2001-01-01', '2002-01-01'] },
{ operator: 'before', value: '2001-01-01', expected: ['2000-12-01'] },
{ operator: 'onOrBefore', value: '2001-01-01', expected: ['2000-12-01', '2001-01-01'] },
].forEach(({ operator, value, expected }) => {
it(`should allow object as value and work with valueGetter, operator: ${operator}`, () => {
render(
<TestCase
value={value.toLocaleDateString()}
value={value}
Copy link
Member

@oliviertassinari oliviertassinari May 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, @m4theushw you were right, this shouldn't be a Date object but a string. Otherwise, we are off the actual behavior of the component.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I returned the string value in #1722 to match the actual implementation.

operator={operator}
rows={[
{
id: 3,
brand: { date: new Date(2000, 11, 1) },
brand: { date: new Date('2000-12-01') },
},
{
id: 4,
brand: { date: new Date(2001, 0, 1) },
brand: { date: new Date('2001-01-01') },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't use new Date('') per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date#parameters

Screenshot 2021-05-19 at 22 41 13

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better. 👍

},
{
id: 5,
brand: { date: new Date(2002, 0, 1) },
brand: { date: new Date('2002-01-01') },
},
]}
columns={[
Expand Down