Skip to content

Commit 461b552

Browse files
timdeschryvertimdeschryver
committed
chore: run prettier 2.0
1 parent aa5f891 commit 461b552

31 files changed

+112
-146
lines changed

Diff for: ‎prettier.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ module.exports = {
44
useTabs: false,
55
semi: true,
66
singleQuote: true,
7-
trailingComma: "all",
8-
bracketSpacing: true
7+
trailingComma: 'all',
8+
bracketSpacing: true,
99
};

Diff for: ‎projects/jest-utils/tests/create-mock.spec.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ class FixtureService {
1414

1515
@Component({
1616
selector: 'fixture',
17-
template: `
18-
<button (click)="print()">Print</button>
19-
`,
17+
template: ` <button (click)="print()">Print</button> `,
2018
})
2119
export class FixtureComponent {
2220
constructor(private service: FixtureService) {}
@@ -41,7 +39,7 @@ it('provides a mock service', async () => {
4139
expect(service.print).toHaveBeenCalledTimes(1);
4240
});
4341

44-
it('is possible to write a mock implementation', async done => {
42+
it('is possible to write a mock implementation', async (done) => {
4543
const { click, getByText } = await render(FixtureComponent, {
4644
providers: [provideMock(FixtureService)],
4745
});

Diff for: ‎projects/testing-library/migrations/4_0_0/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function createRule(ruleName: string): TslintFixTask {
1717
);
1818
}
1919

20-
export default function(): Rule {
20+
export default function (): Rule {
2121
return (_, context) => {
2222
const noCreateComponentRule = createRule('no-create-component');
2323
const noComponentParametersRule = createRule('no-component-parameters');

Diff for: ‎projects/testing-library/migrations/4_0_0/rules/noComponentParametersRule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const FAILURE_MESSAGE = 'Found `parameters` parameter, use `componentProperties`
1212
export class Rule extends Rules.AbstractRule {
1313
public apply(ast: ts.SourceFile): Array<RuleFailure> {
1414
return tsquery(ast, IS_COMPONENT_PROPERTY_QUERY)
15-
.map(result => {
15+
.map((result) => {
1616
const [parameterNode] = tsquery(result, COMPONENT_PARAMETERS_PROPERTY_VALUE_QUERY);
1717
if (!parameterNode) {
1818
return [];

Diff for: ‎projects/testing-library/migrations/4_0_0/rules/noCreateComponentRule.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class Rule extends Rules.AbstractRule {
1919
}
2020

2121
private getImports(ast: ts.SourceFile): Array<RuleFailure> {
22-
return tsquery(ast, CREATE_COMPONENT_IMPORT_QUERY).map(result => {
22+
return tsquery(ast, CREATE_COMPONENT_IMPORT_QUERY).map((result) => {
2323
const replacement = new Replacement(result.getStart(), result.getWidth(), RENDER);
2424
const start = result.getStart();
2525
const end = result.getEnd();
@@ -29,7 +29,7 @@ export class Rule extends Rules.AbstractRule {
2929
}
3030

3131
private getUsages(ast: ts.SourceFile): Array<RuleFailure> {
32-
return tsquery(ast, CREATE_COMPONENT_CALL_EXPRESSION_QUERY).map(result => {
32+
return tsquery(ast, CREATE_COMPONENT_CALL_EXPRESSION_QUERY).map((result) => {
3333
const replacement = new Replacement(result.getStart(), result.getWidth(), RENDER);
3434
const start = result.getStart();
3535
const end = result.getEnd();

Diff for: ‎projects/testing-library/migrations/5_1_2/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function updatePackageJson(host: Tree) {
4444
return host;
4545
}
4646

47-
export default function(): Rule {
47+
export default function (): Rule {
4848
return (host, context) => {
4949
context.addTask(createRule('no-angular-extensions-import'));
5050

Diff for: ‎projects/testing-library/migrations/5_1_2/rules/noAngularExtensionsImportRule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class Rule extends Rules.AbstractRule {
1414
}
1515

1616
private getImports(ast: ts.SourceFile): Array<RuleFailure> {
17-
return tsquery(ast, IMPORT_QUERY).map(result => {
17+
return tsquery(ast, IMPORT_QUERY).map((result) => {
1818
// replace text between (single) quotes
1919
const replacement = new Replacement(result.getStart() + 1, result.getWidth() - 2, '@testing-library/angular');
2020
const start = result.getStart();

Diff for: ‎projects/testing-library/src/lib/testing-library.ts

+39-48
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { createSelectOptions, createType, tab } from './user-events';
2323
const mountedFixtures = new Set<ComponentFixture<any>>();
2424

2525
dtlConfigure({
26-
eventWrapper: cb => {
26+
eventWrapper: (cb) => {
2727
const result = cb();
2828
detectChangesForMountedFixtures();
2929
return result;
@@ -69,7 +69,7 @@ export async function render<SutType, WrapperType = SutType>(
6969
if (componentProviders) {
7070
componentProviders
7171
.reduce((acc, provider) => acc.concat(provider), [])
72-
.forEach(p => {
72+
.forEach((p) => {
7373
const { provide, ...provider } = p;
7474
TestBed.overrideProvider(provide, provider);
7575
});
@@ -103,17 +103,14 @@ export async function render<SutType, WrapperType = SutType>(
103103
detectChanges();
104104
}
105105

106-
const eventsWithDetectChanges = Object.keys(dtlFireEvent).reduce(
107-
(events, key) => {
108-
events[key] = (element: HTMLElement, options?: {}) => {
109-
const result = dtlFireEvent[key](element, options);
110-
detectChanges();
111-
return result;
112-
};
113-
return events;
114-
},
115-
{} as FireFunction & FireObject,
116-
);
106+
const eventsWithDetectChanges = Object.keys(dtlFireEvent).reduce((events, key) => {
107+
events[key] = (element: HTMLElement, options?: {}) => {
108+
const result = dtlFireEvent[key](element, options);
109+
detectChanges();
110+
return result;
111+
};
112+
return events;
113+
}, {} as FireFunction & FireObject);
117114

118115
const rerender = (rerenderedProperties: Partial<SutType>) => {
119116
setComponentProperties(fixture, { componentProperties: rerenderedProperties });
@@ -177,7 +174,7 @@ export async function render<SutType, WrapperType = SutType>(
177174
container: fixture.nativeElement,
178175
debug: (element = fixture.nativeElement, maxLength, options) =>
179176
Array.isArray(element)
180-
? element.forEach(e => console.log(dtlPrettyDOM(e, maxLength, options)))
177+
? element.forEach((e) => console.log(dtlPrettyDOM(e, maxLength, options)))
181178
: console.log(dtlPrettyDOM(element, maxLength, options)),
182179
type: createType(eventsWithDetectChanges),
183180
selectOptions: createSelectOptions(eventsWithDetectChanges),
@@ -275,14 +272,14 @@ async function waitForElementToBeRemovedWrapper<T>(
275272
let cb;
276273
if (typeof callback !== 'function') {
277274
const elements = (Array.isArray(callback) ? callback : [callback]) as HTMLElement[];
278-
const getRemainingElements = elements.map(element => {
275+
const getRemainingElements = elements.map((element) => {
279276
let parent = element.parentElement;
280277
while (parent.parentElement) {
281278
parent = parent.parentElement;
282279
}
283280
return () => (parent.contains(element) ? element : null);
284281
});
285-
cb = () => getRemainingElements.map(c => c()).filter(Boolean);
282+
cb = () => getRemainingElements.map((c) => c()).filter(Boolean);
286283
} else {
287284
cb = callback;
288285
}
@@ -317,34 +314,31 @@ class WrapperComponent {}
317314
* Wrap findBy queries to poke the Angular change detection cycle
318315
*/
319316
function replaceFindWithFindAndDetectChanges<T>(container: HTMLElement, originalQueriesForContainer: T): T {
320-
return Object.keys(originalQueriesForContainer).reduce(
321-
(newQueries, key) => {
322-
if (key.startsWith('find')) {
323-
const getByQuery = dtlQueries[key.replace('find', 'get')];
324-
newQueries[key] = async (text, options, waitOptions) => {
325-
// original implementation at https://github.com/testing-library/dom-testing-library/blob/master/src/query-helpers.js
326-
const result = await waitForWrapper(
327-
detectChangesForMountedFixtures,
328-
() => getByQuery(container, text, options),
329-
waitOptions,
330-
);
331-
return result;
332-
};
333-
} else {
334-
newQueries[key] = originalQueriesForContainer[key];
335-
}
317+
return Object.keys(originalQueriesForContainer).reduce((newQueries, key) => {
318+
if (key.startsWith('find')) {
319+
const getByQuery = dtlQueries[key.replace('find', 'get')];
320+
newQueries[key] = async (text, options, waitOptions) => {
321+
// original implementation at https://github.com/testing-library/dom-testing-library/blob/master/src/query-helpers.js
322+
const result = await waitForWrapper(
323+
detectChangesForMountedFixtures,
324+
() => getByQuery(container, text, options),
325+
waitOptions,
326+
);
327+
return result;
328+
};
329+
} else {
330+
newQueries[key] = originalQueriesForContainer[key];
331+
}
336332

337-
return newQueries;
338-
},
339-
{} as T,
340-
);
333+
return newQueries;
334+
}, {} as T);
341335
}
342336

343337
/**
344338
* Call detectChanges for all fixtures
345339
*/
346340
function detectChangesForMountedFixtures() {
347-
mountedFixtures.forEach(fixture => {
341+
mountedFixtures.forEach((fixture) => {
348342
try {
349343
fixture.detectChanges();
350344
} catch (err) {
@@ -358,17 +352,14 @@ function detectChangesForMountedFixtures() {
358352
/**
359353
* Wrap dom-fireEvent to poke the Angular change detection cycle after an event is fired
360354
*/
361-
const fireEvent = Object.keys(dtlFireEvent).reduce(
362-
(events, key) => {
363-
events[key] = (element: HTMLElement, options?: {}) => {
364-
const result = dtlFireEvent[key](element, options);
365-
detectChangesForMountedFixtures();
366-
return result;
367-
};
368-
return events;
369-
},
370-
{} as typeof dtlFireEvent,
371-
);
355+
const fireEvent = Object.keys(dtlFireEvent).reduce((events, key) => {
356+
events[key] = (element: HTMLElement, options?: {}) => {
357+
const result = dtlFireEvent[key](element, options);
358+
detectChangesForMountedFixtures();
359+
return result;
360+
};
361+
return events;
362+
}, {} as typeof dtlFireEvent);
372363

373364
/**
374365
* Re-export screen with patched queries

Diff for: ‎projects/testing-library/src/lib/user-events/selectOptions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export function createSelectOptions(fireEvent: FireFunction & FireObject) {
3535

3636
return async function selectOptions(
3737
element: HTMLElement,
38-
options: Matcher | ByRoleOptions | ((Matcher | ByRoleOptions)[]),
38+
options: Matcher | ByRoleOptions | (Matcher | ByRoleOptions)[],
3939
) {
4040
const selectElement = element as HTMLSelectElement;
4141

4242
if (selectElement.selectedOptions) {
43-
Array.from(selectElement.selectedOptions).forEach(option => (option.selected = false));
43+
Array.from(selectElement.selectedOptions).forEach((option) => (option.selected = false));
4444
}
4545

4646
const focusedElement = document.activeElement;

Diff for: ‎projects/testing-library/src/lib/user-events/type.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FireFunction, FireObject } from '@testing-library/dom';
22

33
function wait(time) {
4-
return new Promise(function(resolve) {
4+
return new Promise(function (resolve) {
55
setTimeout(() => resolve(), time);
66
});
77
}

Diff for: ‎projects/testing-library/tests/auto-cleanup.spec.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { render } from '../src/public_api';
33

44
@Component({
55
selector: 'fixture',
6-
template: `
7-
Hello {{ name }}!
8-
`,
6+
template: ` Hello {{ name }}! `,
97
})
108
class FixtureComponent {
119
@Input() name: string;

Diff for: ‎projects/testing-library/tests/find-by.spec.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import { mapTo, timeout } from 'rxjs/operators';
55

66
@Component({
77
selector: 'fixture',
8-
template: `
9-
<div>{{ result | async }}</div>
10-
`,
8+
template: ` <div>{{ result | async }}</div> `,
119
})
1210
class FixtureComponent {
1311
result = timer(30).pipe(mapTo('I am visible'));

Diff for: ‎projects/testing-library/tests/fire-event.spec.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { render } from '../src/public_api';
33

44
@Component({
55
selector: 'fixture',
6-
template: `
7-
<input type="text" data-testid="input" />
8-
`,
6+
template: ` <input type="text" data-testid="input" /> `,
97
})
108
class FixtureComponent {}
119

Diff for: ‎projects/testing-library/tests/migration/4_0_0.spec.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ describe('Migration to version 4.0.0', () => {
110110
schematicRunner.runSchematic('migration-4.0.0', {}, tree);
111111
await schematicRunner.engine.executePostTasks().toPromise();
112112

113-
const actual = await host
114-
.read(specPath)
115-
.toPromise()
116-
.then(virtualFs.fileBufferToString);
113+
const actual = await host.read(specPath).toPromise().then(virtualFs.fileBufferToString);
117114

118115
expect(actual).toBe(expected);
119116
});

Diff for: ‎projects/testing-library/tests/migration/5_1_2.spec.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ describe('Migration to version 5.1.2', () => {
2727
await schematicRunner.runSchematicAsync('migration-5.1.2', {}, tree).toPromise();
2828
await schematicRunner.engine.executePostTasks().toPromise();
2929

30-
const actual = await host
31-
.read(specPath)
32-
.toPromise()
33-
.then(virtualFs.fileBufferToString);
30+
const actual = await host.read(specPath).toPromise().then(virtualFs.fileBufferToString);
3431

3532
expect(actual).toBe(stripIndents`
3633
import { render } from '@testing-library/angular';

Diff for: ‎projects/testing-library/tests/rerender.spec.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { render } from '../src/public_api';
33

44
@Component({
55
selector: 'fixture',
6-
template: `
7-
{{ name }}
8-
`,
6+
template: ` {{ name }} `,
97
})
108
class FixtureComponent {
119
@Input() name = 'Sarah';

Diff for: ‎projects/testing-library/tests/user-events/selectOptions.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ describe('selectOption: multiple', () => {
179179
value = [];
180180

181181
onChange(event: KeyboardEvent) {
182-
this.value = Array.from((<HTMLSelectElement>event.target).selectedOptions).map(o => o.value);
182+
this.value = Array.from((<HTMLSelectElement>event.target).selectedOptions).map((o) => o.value);
183183
}
184184
}
185185

Diff for: ‎projects/testing-library/tests/user-events/type.spec.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ describe('does not type when ', () => {
225225
const inputControl = component.getByTestId('input') as HTMLInputElement;
226226
component.type(inputControl, 'Hello');
227227

228-
Object.values(componentEvents).forEach(evt => expect(evt).not.toHaveBeenCalled());
228+
Object.values(componentEvents).forEach((evt) => expect(evt).not.toHaveBeenCalled());
229229
expect(inputControl.value).toBe('');
230230
});
231231

@@ -260,7 +260,7 @@ describe('does not type when ', () => {
260260
test('event.preventDefault() is called', async () => {
261261
const componentProperties = {
262262
onChange: jest.fn(),
263-
onKeyDown: jest.fn().mockImplementation(event => event.preventDefault()),
263+
onKeyDown: jest.fn().mockImplementation((event) => event.preventDefault()),
264264
};
265265

266266
const component = await render(FixtureComponent, { componentProperties });
@@ -281,9 +281,7 @@ describe('does not type when ', () => {
281281
test('can clear an input field', async () => {
282282
@Component({
283283
selector: 'fixture',
284-
template: `
285-
<input type="text" data-testid="input" [value]="initialValue" />
286-
`,
284+
template: ` <input type="text" data-testid="input" [value]="initialValue" /> `,
287285
})
288286
class FixtureComponent {
289287
@Input() initialValue = '';

Diff for: ‎projects/testing-library/tests/wait-for-element-to-be-removed.spec.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import { timer } from 'rxjs';
44

55
@Component({
66
selector: 'fixture',
7-
template: `
8-
<div *ngIf="visible" data-testid="im-here">👋</div>
9-
`,
7+
template: ` <div *ngIf="visible" data-testid="im-here">👋</div> `,
108
})
119
class FixtureComponent implements OnInit {
1210
visible = true;

Diff for: ‎src/app/examples/01-nested-component.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core';
22

33
@Component({
44
selector: 'app-button',
5-
template: `
6-
<button (click)="raise.emit()">{{ name }}</button>
7-
`,
5+
template: ` <button (click)="raise.emit()">{{ name }}</button> `,
86
})
97
export class NestedButtonComponent {
108
@Input() name: string;
@@ -13,9 +11,7 @@ export class NestedButtonComponent {
1311

1412
@Component({
1513
selector: 'app-value',
16-
template: `
17-
<span data-testid="value">{{ value }}</span>
18-
`,
14+
template: ` <span data-testid="value">{{ value }}</span> `,
1915
})
2016
export class NestedValueComponent {
2117
@Input() value: number;

0 commit comments

Comments
 (0)