Skip to content

Commit

Permalink
PCF-562 Consider adding the OS version to the name of the platform in…
Browse files Browse the repository at this point in the history 
… the "Platform" column (#816)

* Add os version

* Refactor

* Fix tests

* Add os version on subtests

* fix typescript error

* Address code review, nit changes
  • Loading branch information
@esanuandra
esanuandra authored Jan 8, 2025
1 parent 0fcfaf9 commit dc284e4
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 77 deletions.
102 changes: 51 additions & 51 deletions src/__tests__/CompareResults/ResultsTable.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ describe('Results Table', () => {
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html opt e10s fission stylo webrender',
' rev: spam',
' - OSX, Improvement, Low',
' - OS X 10.15, Improvement, Low',
' rev: devilrabbit',
' - OSX, Improvement, Low',
' - OS X 10.15, Improvement, Low',
]);
expect(screen.getByRole('rowgroup')).toMatchSnapshot();
});
Expand All @@ -165,10 +165,10 @@ describe('Results Table', () => {
await screen.findByText('a11yr');
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
' - Android, Improvement, Low',
]);

Expand All @@ -178,8 +178,8 @@ describe('Results Table', () => {
await clickMenuItem(user, /Platform/, /Windows/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Android, Improvement, Low',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
Expand All @@ -189,7 +189,7 @@ describe('Results Table', () => {
await clickMenuItem(user, /Platform/, /Linux/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - OS X 10.15, Improvement, Low',
' - Android, Improvement, Low',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
Expand All @@ -199,8 +199,8 @@ describe('Results Table', () => {
await clickMenuItem(user, /Platform/, /Linux/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Android, Improvement, Low',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
Expand All @@ -210,20 +210,20 @@ describe('Results Table', () => {
await clickMenuItem(user, /Platform/, 'Select all values');
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
' - Android, Improvement, Low',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({});

await clickMenuItem(user, /Platform/, /OSX/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
' - Android, Improvement, Low',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
Expand All @@ -233,9 +233,9 @@ describe('Results Table', () => {
await clickMenuItem(user, /Platform/, /Android/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
platform: ['windows', 'linux'],
Expand All @@ -258,19 +258,19 @@ describe('Results Table', () => {
await screen.findByText('a11yr');
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({});

const user = userEvent.setup({ delay: null });
await clickMenuItem(user, /Status/, /No changes/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
status: ['improvement', 'regression'],
Expand All @@ -280,9 +280,9 @@ describe('Results Table', () => {
await clickMenuItem(user, /Status/, /Improvement/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
status: ['none', 'regression'],
Expand All @@ -291,8 +291,8 @@ describe('Results Table', () => {
await clickMenuItem(user, /Status/, /Regression/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Windows, -, High',
' - Windows, -, -',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
status: ['none'],
Expand All @@ -301,7 +301,7 @@ describe('Results Table', () => {
await clickMenuItem(user, /Status/, /Select only.*Regression/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Linux 18.04, Regression, Medium',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
status: ['regression'],
Expand All @@ -315,20 +315,20 @@ describe('Results Table', () => {
await screen.findByText('a11yr');
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({});

const user = userEvent.setup({ delay: null });
await clickMenuItem(user, /Confidence/, /Low/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
confidence: ['none', 'medium', 'high'],
Expand All @@ -337,8 +337,8 @@ describe('Results Table', () => {
await clickMenuItem(user, /Confidence/, /High/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Linux, Regression, Medium',
' - Windows, -, -',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
confidence: ['none', 'medium'],
Expand All @@ -347,7 +347,7 @@ describe('Results Table', () => {
await clickMenuItem(user, /Confidence/, /Medium/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Windows, -, -',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
confidence: ['none'],
Expand All @@ -356,19 +356,19 @@ describe('Results Table', () => {
await clickMenuItem(user, /Confidence/, /Select all values/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - Windows, -, -',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
' - Windows 10, -, -',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({});

await clickMenuItem(user, /Confidence/, /No value/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - OSX, Improvement, Low',
' - Linux, Regression, Medium',
' - Windows, -, High',
' - OS X 10.15, Improvement, Low',
' - Linux 18.04, Regression, Medium',
' - Windows 10, -, High',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
confidence: ['low', 'medium', 'high'],
Expand All @@ -377,7 +377,7 @@ describe('Results Table', () => {
await clickMenuItem(user, /Confidence/, /Select only.*High/);
expect(summarizeVisibleRows()).toEqual([
'a11yr dhtml.html spam opt e10s fission stylo webrender',
' - Windows, -, High',
' - Windows 10, -, High',
]);
expect(summarizeTableFiltersFromUrl()).toEqual({
confidence: ['high'],
Expand Down
6 changes: 3 additions & 3 deletions src/__tests__/CompareResults/RevisionRow.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ describe('<RevisionRow>', () => {
it.each([
{
platform: 'linux1804-32-shippable-qr',
shortName: 'Linux',
shortName: 'Linux 18.04',
hasIcon: true,
},
{
platform: 'macosx1014-64-shippable-qr',
shortName: 'OSX',
shortName: 'OS X 10.14',
hasIcon: true,
},
{
platform: 'windows2012-64-shippable',
shortName: 'Windows',
shortName: 'Windows 2012',
hasIcon: true,
},
{
Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/CompareResults/__snapshots__/OverTimeResultsView.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ exports[`Results View The table should match snapshot and other elements should
/>
</svg>
<span>
OSX
OS X 10.15
</span>
</div>
</div>
Expand Down Expand Up @@ -729,7 +729,7 @@ exports[`Results View The table should match snapshot and other elements should
/>
</svg>
<span>
Linux
Linux 18.04
</span>
</div>
</div>
Expand Down Expand Up @@ -953,7 +953,7 @@ exports[`Results View The table should match snapshot and other elements should
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down Expand Up @@ -1166,7 +1166,7 @@ exports[`Results View The table should match snapshot and other elements should
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/__tests__/CompareResults/__snapshots__/ResultsTable.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ exports[`Results Table Should match snapshot 1`] = `
/>
</svg>
<span>
OSX
OS X 10.15
</span>
</div>
</div>
Expand Down Expand Up @@ -1453,7 +1453,7 @@ exports[`Results Table Should match snapshot 1`] = `
/>
</svg>
<span>
Linux
Linux 18.04
</span>
</div>
</div>
Expand Down Expand Up @@ -1677,7 +1677,7 @@ exports[`Results Table Should match snapshot 1`] = `
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down Expand Up @@ -1943,7 +1943,7 @@ exports[`Results Table Should match snapshot 1`] = `
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down Expand Up @@ -2224,7 +2224,7 @@ exports[`Results Table should render different blocks when rendering several rev
/>
</svg>
<span>
OSX
OS X 10.15
</span>
</div>
</div>
Expand Down Expand Up @@ -2460,7 +2460,7 @@ exports[`Results Table should render different blocks when rendering several rev
/>
</svg>
<span>
OSX
OS X 10.15
</span>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/CompareResults/__snapshots__/ResultsView.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ exports[`Results View The table should match snapshot and other elements should
/>
</svg>
<span>
OSX
OS X 10.15
</span>
</div>
</div>
Expand Down Expand Up @@ -1539,7 +1539,7 @@ exports[`Results View The table should match snapshot and other elements should
/>
</svg>
<span>
Linux
Linux 18.04
</span>
</div>
</div>
Expand Down Expand Up @@ -1763,7 +1763,7 @@ exports[`Results View The table should match snapshot and other elements should
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down Expand Up @@ -1976,7 +1976,7 @@ exports[`Results View The table should match snapshot and other elements should
</svg>
<span>
Windows
Windows 10
</span>
</div>
</div>
Expand Down
Loading

0 comments on commit dc284e4

Please sign in to comment.