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

Updated parameterized test pattern #1379

Merged
merged 14 commits into from
Sep 19, 2023
Merged

Updated parameterized test pattern #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3f87344
Parameterize test pattern
rajsite Jul 23, 2023
19c3bac
Lint
rajsite Jul 23, 2023
366cb16
Change files
rajsite Jul 23, 2023
921f2eb
Add parameterizeList helper
rajsite Jul 23, 2023
e3ff123
lint
rajsite Jul 23, 2023
897b44f
Doc tweak
rajsite Jul 23, 2023
629be28
Test
rajsite Jul 23, 2023
2d9c520
Lint
rajsite Jul 23, 2023
f75a546
update deprecation comment
rajsite Jul 23, 2023
1cdb66e
Merge branch 'main' into parameterized-test-helper
rajsite Sep 18, 2023
ed25904
parameterizeNamedList
rajsite Sep 19, 2023
9090d9d
Comment on jasmine global aliases
rajsite Sep 19, 2023
d9aef99
Use paramterizeNamedList on more complex test
rajsite Sep 19, 2023
39b1a96
lint
rajsite Sep 19, 2023
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
7 changes: 7 additions & 0 deletions change/@ni-nimble-components-5528f3eb-a2ce-4e80-9df4-6ddb04f8b015.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
rajsite marked this conversation as resolved.
Show resolved Hide resolved
"type": "none",
"comment": "Parameterize test pattern",
"packageName": "@ni/nimble-components",
"email": "rajsite@users.noreply.github.com",
"dependentChangeType": "none"
}
26 changes: 8 additions & 18 deletions packages/nimble-components/src/anchor-button/tests/anchor-button.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { html } from '@microsoft/fast-element';
import { AnchorButton } from '..';
import { waitForUpdatesAsync } from '../../testing/async-helpers';
import { fixture, Fixture } from '../../utilities/tests/fixture';
import { getSpecTypeByNamedList } from '../../utilities/tests/parameterized';
import { parameterizeNamedList } from '../../utilities/tests/parameterized';

async function setup(): Promise<Fixture<AnchorButton>> {
return fixture<AnchorButton>(
Expand Down Expand Up @@ -49,7 +49,7 @@ describe('AnchorButton', () => {
expect(element.control!.getAttribute('href')).toBeNull();
});

const attributeNames: { name: string }[] = [
const attributeNames = [
{ name: 'download' },
{ name: 'hreflang' },
{ name: 'ping' },
Expand Down Expand Up @@ -77,27 +77,17 @@ describe('AnchorButton', () => {
{ name: 'aria-owns' },
{ name: 'aria-relevant' },
{ name: 'aria-roledescription' }
];
] as const;
describe('should reflect value to the internal control', () => {
const focused: string[] = [];
const disabled: string[] = [];
for (const attribute of attributeNames) {
const specType = getSpecTypeByNamedList(
attribute,
focused,
disabled
);
// eslint-disable-next-line @typescript-eslint/no-loop-func
specType(`for attribute ${attribute.name}`, async () => {
parameterizeNamedList(attributeNames, (spec, name) => {
spec(`for attribute ${name}`, async () => {
await connect();

element.setAttribute(attribute.name, 'foo');
element.setAttribute(name, 'foo');
await waitForUpdatesAsync();

expect(element.control!.getAttribute(attribute.name)).toBe(
'foo'
);
expect(element.control!.getAttribute(name)).toBe('foo');
});
}
});
});
});
73 changes: 41 additions & 32 deletions packages/nimble-components/src/anchor-tabs/tests/anchor-tabs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import '../../anchor-tab';
import type { AnchorTab } from '../../anchor-tab';
import { waitForUpdatesAsync } from '../../testing/async-helpers';
import { fixture, Fixture } from '../../utilities/tests/fixture';
import { getSpecTypeByNamedList } from '../../utilities/tests/parameterized';
import { parameterizeNamedList } from '../../utilities/tests/parameterized';

describe('AnchorTabs', () => {
let element: AnchorTabs;
Expand Down Expand Up @@ -182,168 +182,177 @@ describe('AnchorTabs', () => {
await disconnect();
});

const navigationTests: {
name: string,
disabledIndex?: number,
hiddenIndex?: number,
initialFocusIndex: number,
keyName: string,
expectedFinalFocusIndex: number
}[] = [
const navigationTests = [
{
name: 'should focus next tab when right arrow key pressed',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 0,
keyName: keyArrowRight,
expectedFinalFocusIndex: 1
},
{
name: 'should focus previous tab when left arrow key pressed',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 1,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 0
},
{
name: 'should wrap to first tab when arrowing right on last tab',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 2,
keyName: keyArrowRight,
expectedFinalFocusIndex: 0
},
{
name: 'should wrap to last tab when arrowing left on first tab',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 0,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 2
},
{
name: 'should focus first tab when Home key pressed',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 1,
keyName: keyHome,
expectedFinalFocusIndex: 0
},
{
name: 'should focus last tab when End key pressed',
disabledIndex: undefined,
hiddenIndex: undefined,
initialFocusIndex: 1,
keyName: keyEnd,
expectedFinalFocusIndex: 2
},
{
name: 'should skip disabled tab when arrowing right',
disabledIndex: 1,
hiddenIndex: undefined,
initialFocusIndex: 0,
keyName: keyArrowRight,
expectedFinalFocusIndex: 2
},
{
name: 'should skip disabled tab when arrowing left',
disabledIndex: 1,
hiddenIndex: undefined,
initialFocusIndex: 2,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 0
},
{
name: 'should skip disabled when arrowing right on last tab',
disabledIndex: 0,
hiddenIndex: undefined,
initialFocusIndex: 2,
keyName: keyArrowRight,
expectedFinalFocusIndex: 1
},
{
name: 'should skip disabled when arrowing left on first tab',
disabledIndex: 2,
hiddenIndex: undefined,
initialFocusIndex: 0,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 1
},
{
name: 'should focus first enabled tab when Home key pressed',
disabledIndex: 0,
hiddenIndex: undefined,
initialFocusIndex: 2,
keyName: keyHome,
expectedFinalFocusIndex: 1
},
{
name: 'should focus last enabled tab when End key pressed',
disabledIndex: 2,
hiddenIndex: undefined,
initialFocusIndex: 0,
keyName: keyEnd,
expectedFinalFocusIndex: 1
},
{
name: 'should skip hidden tab when arrowing right',
disabledIndex: undefined,
hiddenIndex: 1,
initialFocusIndex: 0,
keyName: keyArrowRight,
expectedFinalFocusIndex: 2
},
{
name: 'should skip hidden tab when arrowing left',
disabledIndex: undefined,
hiddenIndex: 1,
initialFocusIndex: 2,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 0
},
{
name: 'should skip hidden when arrowing right on last tab',
disabledIndex: undefined,
hiddenIndex: 0,
initialFocusIndex: 2,
keyName: keyArrowRight,
expectedFinalFocusIndex: 1
},
{
name: 'should skip hidden when arrowing left on first tab',
disabledIndex: undefined,
hiddenIndex: 2,
initialFocusIndex: 0,
keyName: keyArrowLeft,
expectedFinalFocusIndex: 1
},
{
name: 'should focus first visible tab when Home key pressed',
disabledIndex: undefined,
hiddenIndex: 0,
initialFocusIndex: 2,
keyName: keyHome,
expectedFinalFocusIndex: 1
},
{
name: 'should focus last visible tab when End key pressed',
disabledIndex: undefined,
hiddenIndex: 2,
initialFocusIndex: 0,
keyName: keyEnd,
expectedFinalFocusIndex: 1
}
];
] as const;
describe('navigation', () => {
const focused: string[] = [];
const disabled: string[] = [];
for (const test of navigationTests) {
const specType = getSpecTypeByNamedList(
test,
focused,
disabled
);
// eslint-disable-next-line @typescript-eslint/no-loop-func
specType(test.name, async () => {
parameterizeNamedList(navigationTests, (spec, name, value) => {
spec(name, async () => {
await connect();
if (test.disabledIndex !== undefined) {
tab(test.disabledIndex).disabled = true;
if (value.disabledIndex !== undefined) {
tab(value.disabledIndex).disabled = true;
await waitForUpdatesAsync();
}
if (test.hiddenIndex !== undefined) {
tab(test.hiddenIndex).hidden = true;
if (value.hiddenIndex !== undefined) {
tab(value.hiddenIndex).hidden = true;
await waitForUpdatesAsync();
}
tab(test.initialFocusIndex).focus();
tab(test.initialFocusIndex).dispatchEvent(
new KeyboardEvent('keydown', { key: test.keyName })
tab(value.initialFocusIndex).focus();
tab(value.initialFocusIndex).dispatchEvent(
new KeyboardEvent('keydown', { key: value.keyName })
);
await waitForUpdatesAsync();
expect(document.activeElement).toBe(
tab(test.expectedFinalFocusIndex)
);
expect(tab(test.expectedFinalFocusIndex).ariaSelected).toBe(
'true'
tab(value.expectedFinalFocusIndex)
);
expect(
tab(value.expectedFinalFocusIndex).ariaSelected
).toBe('true');
});
}
});
});

it('should skip past other tabs when pressing tab key after click', async () => {
Expand Down
Loading
Loading