Skip to content

Commit 7a6d055

Browse files
tests: remove empty strings in string literals (graphql#3970)
1 parent 8d7c8fc commit 7a6d055

File tree

5 files changed

+46
-39
lines changed

5 files changed

+46
-39
lines changed

.eslintrc.cjs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,14 @@ module.exports = {
347347
'no-restricted-globals': 'off',
348348
'no-restricted-imports': 'off',
349349
'no-restricted-properties': 'off',
350-
'no-restricted-syntax': 'off',
350+
'no-restricted-syntax': [
351+
'error',
352+
{
353+
selector: 'TemplateElement[value.raw=/ \\n/]',
354+
message:
355+
'String literals should not contain trailing spaces. If needed for tests please disable locally using eslint comment',
356+
},
357+
],
351358
'no-return-assign': 'error',
352359
'no-return-await': 'error',
353360
'no-script-url': 'error',

src/__testUtils__/kitchenSinkQuery.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
1010
...frag @onFragmentSpread
1111
}
1212
}
13-
13+
1414
field3!
1515
field4?
1616
requiredField5: field5!

src/execution/__tests__/defer-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ describe('Execute: defer directive', () => {
20252025
hero {
20262026
friends {
20272027
nonNullName
2028-
...NameFragment @defer
2028+
...NameFragment @defer
20292029
}
20302030
}
20312031
}

src/execution/__tests__/stream-test.ts

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ describe('Execute: stream directive', () => {
314314
});
315315
it('Can stream a field that returns a list of promises', async () => {
316316
const document = parse(`
317-
query {
317+
query {
318318
friendList @stream(initialCount: 2) {
319319
name
320320
id
@@ -360,7 +360,7 @@ describe('Execute: stream directive', () => {
360360
});
361361
it('Can stream in correct order with lists of promises', async () => {
362362
const document = parse(`
363-
query {
363+
query {
364364
friendList @stream(initialCount: 0) {
365365
name
366366
id
@@ -410,7 +410,7 @@ describe('Execute: stream directive', () => {
410410
});
411411
it('Can stream a field that returns a list with nested promises', async () => {
412412
const document = parse(`
413-
query {
413+
query {
414414
friendList @stream(initialCount: 2) {
415415
name
416416
id
@@ -460,7 +460,7 @@ describe('Execute: stream directive', () => {
460460
});
461461
it('Handles rejections in a field that returns a list of promises before initialCount is reached', async () => {
462462
const document = parse(`
463-
query {
463+
query {
464464
friendList @stream(initialCount: 2) {
465465
name
466466
id
@@ -505,7 +505,7 @@ describe('Execute: stream directive', () => {
505505
});
506506
it('Handles rejections in a field that returns a list of promises after initialCount is reached', async () => {
507507
const document = parse(`
508-
query {
508+
query {
509509
friendList @stream(initialCount: 1) {
510510
name
511511
id
@@ -559,7 +559,7 @@ describe('Execute: stream directive', () => {
559559
});
560560
it('Can stream a field that returns an async iterable', async () => {
561561
const document = parse(`
562-
query {
562+
query {
563563
friendList @stream {
564564
name
565565
id
@@ -616,7 +616,7 @@ describe('Execute: stream directive', () => {
616616
});
617617
it('Can stream a field that returns an async iterable, using a non-zero initialCount', async () => {
618618
const document = parse(`
619-
query {
619+
query {
620620
friendList @stream(initialCount: 2) {
621621
name
622622
id
@@ -658,7 +658,7 @@ describe('Execute: stream directive', () => {
658658
});
659659
it('Negative values of initialCount throw field errors on a field that returns an async iterable', async () => {
660660
const document = parse(`
661-
query {
661+
query {
662662
friendList @stream(initialCount: -2) {
663663
name
664664
id
@@ -684,7 +684,7 @@ describe('Execute: stream directive', () => {
684684
});
685685
it('Can handle concurrent calls to .next() without waiting', async () => {
686686
const document = parse(`
687-
query {
687+
query {
688688
friendList @stream(initialCount: 2) {
689689
name
690690
id
@@ -736,7 +736,7 @@ describe('Execute: stream directive', () => {
736736
});
737737
it('Handles error thrown in async iterable before initialCount is reached', async () => {
738738
const document = parse(`
739-
query {
739+
query {
740740
friendList @stream(initialCount: 2) {
741741
name
742742
id
@@ -764,7 +764,7 @@ describe('Execute: stream directive', () => {
764764
});
765765
it('Handles error thrown in async iterable after initialCount is reached', async () => {
766766
const document = parse(`
767-
query {
767+
query {
768768
friendList @stream(initialCount: 1) {
769769
name
770770
id
@@ -804,7 +804,7 @@ describe('Execute: stream directive', () => {
804804
});
805805
it('Handles null returned in non-null list items after initialCount is reached', async () => {
806806
const document = parse(`
807-
query {
807+
query {
808808
nonNullFriendList @stream(initialCount: 1) {
809809
name
810810
}
@@ -842,7 +842,7 @@ describe('Execute: stream directive', () => {
842842
});
843843
it('Handles null returned in non-null async iterable list items after initialCount is reached', async () => {
844844
const document = parse(`
845-
query {
845+
query {
846846
nonNullFriendList @stream(initialCount: 1) {
847847
name
848848
}
@@ -889,7 +889,7 @@ describe('Execute: stream directive', () => {
889889
});
890890
it('Handles errors thrown by completeValue after initialCount is reached', async () => {
891891
const document = parse(`
892-
query {
892+
query {
893893
scalarList @stream(initialCount: 1)
894894
}
895895
`);
@@ -925,7 +925,7 @@ describe('Execute: stream directive', () => {
925925
});
926926
it('Handles async errors thrown by completeValue after initialCount is reached', async () => {
927927
const document = parse(`
928-
query {
928+
query {
929929
friendList @stream(initialCount: 1) {
930930
nonNullName
931931
}
@@ -978,7 +978,7 @@ describe('Execute: stream directive', () => {
978978
});
979979
it('Handles nested async errors thrown by completeValue after initialCount is reached', async () => {
980980
const document = parse(`
981-
query {
981+
query {
982982
friendList @stream(initialCount: 1) {
983983
nonNullName
984984
}
@@ -1029,7 +1029,7 @@ describe('Execute: stream directive', () => {
10291029
});
10301030
it('Handles async errors thrown by completeValue after initialCount is reached for a non-nullable list', async () => {
10311031
const document = parse(`
1032-
query {
1032+
query {
10331033
nonNullFriendList @stream(initialCount: 1) {
10341034
nonNullName
10351035
}
@@ -1071,7 +1071,7 @@ describe('Execute: stream directive', () => {
10711071
});
10721072
it('Handles nested async errors thrown by completeValue after initialCount is reached for a non-nullable list', async () => {
10731073
const document = parse(`
1074-
query {
1074+
query {
10751075
nonNullFriendList @stream(initialCount: 1) {
10761076
nonNullName
10771077
}
@@ -1111,7 +1111,7 @@ describe('Execute: stream directive', () => {
11111111
});
11121112
it('Handles async errors thrown by completeValue after initialCount is reached from async iterable', async () => {
11131113
const document = parse(`
1114-
query {
1114+
query {
11151115
friendList @stream(initialCount: 1) {
11161116
nonNullName
11171117
}
@@ -1167,7 +1167,7 @@ describe('Execute: stream directive', () => {
11671167
});
11681168
it('Handles async errors thrown by completeValue after initialCount is reached from async generator for a non-nullable list', async () => {
11691169
const document = parse(`
1170-
query {
1170+
query {
11711171
nonNullFriendList @stream(initialCount: 1) {
11721172
nonNullName
11731173
}
@@ -1211,7 +1211,7 @@ describe('Execute: stream directive', () => {
12111211
});
12121212
it('Handles async errors thrown by completeValue after initialCount is reached from async iterable for a non-nullable list when the async iterable does not provide a return method) ', async () => {
12131213
const document = parse(`
1214-
query {
1214+
query {
12151215
nonNullFriendList @stream(initialCount: 1) {
12161216
nonNullName
12171217
}
@@ -1279,7 +1279,7 @@ describe('Execute: stream directive', () => {
12791279
});
12801280
it('Handles async errors thrown by completeValue after initialCount is reached from async iterable for a non-nullable list when the async iterable provides concurrent next/return methods and has a slow return ', async () => {
12811281
const document = parse(`
1282-
query {
1282+
query {
12831283
nonNullFriendList @stream(initialCount: 1) {
12841284
nonNullName
12851285
}
@@ -1358,7 +1358,7 @@ describe('Execute: stream directive', () => {
13581358
});
13591359
it('Filters payloads that are nulled', async () => {
13601360
const document = parse(`
1361-
query {
1361+
query {
13621362
nestedObject {
13631363
nonNullScalarField
13641364
nestedFriendList @stream(initialCount: 0) {
@@ -1391,7 +1391,7 @@ describe('Execute: stream directive', () => {
13911391
});
13921392
it('Filters payloads that are nulled by a later synchronous error', async () => {
13931393
const document = parse(`
1394-
query {
1394+
query {
13951395
nestedObject {
13961396
nestedFriendList @stream(initialCount: 0) {
13971397
name
@@ -1424,7 +1424,7 @@ describe('Execute: stream directive', () => {
14241424
});
14251425
it('Does not filter payloads when null error is in a different path', async () => {
14261426
const document = parse(`
1427-
query {
1427+
query {
14281428
otherNestedObject: nestedObject {
14291429
... @defer {
14301430
scalarField
@@ -1486,7 +1486,7 @@ describe('Execute: stream directive', () => {
14861486
});
14871487
it('Filters stream payloads that are nulled in a deferred payload', async () => {
14881488
const document = parse(`
1489-
query {
1489+
query {
14901490
nestedObject {
14911491
... @defer {
14921492
deeperNestedObject {
@@ -1545,7 +1545,7 @@ describe('Execute: stream directive', () => {
15451545
});
15461546
it('Filters defer payloads that are nulled in a stream response', async () => {
15471547
const document = parse(`
1548-
query {
1548+
query {
15491549
friendList @stream(initialCount: 0) {
15501550
nonNullName
15511551
... @defer {
@@ -1624,7 +1624,7 @@ describe('Execute: stream directive', () => {
16241624
};
16251625

16261626
const document = parse(`
1627-
query {
1627+
query {
16281628
nestedObject {
16291629
... @defer {
16301630
deeperNestedObject {
@@ -1698,7 +1698,7 @@ describe('Execute: stream directive', () => {
16981698
});
16991699
it('Handles promises returned by completeValue after initialCount is reached', async () => {
17001700
const document = parse(`
1701-
query {
1701+
query {
17021702
friendList @stream(initialCount: 1) {
17031703
id
17041704
name
@@ -1815,7 +1815,7 @@ describe('Execute: stream directive', () => {
18151815
const { promise: slowFieldPromise, resolve: resolveSlowField } =
18161816
promiseWithResolvers();
18171817
const document = parse(`
1818-
query {
1818+
query {
18191819
nestedObject {
18201820
... DeferFragment @defer
18211821
}
@@ -1918,7 +1918,7 @@ describe('Execute: stream directive', () => {
19181918
} = promiseWithResolvers();
19191919

19201920
const document = parse(`
1921-
query {
1921+
query {
19221922
friendList @stream(initialCount: 1, label:"stream-label") {
19231923
...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
19241924
id
@@ -2019,7 +2019,7 @@ describe('Execute: stream directive', () => {
20192019
} = promiseWithResolvers();
20202020

20212021
const document = parse(`
2022-
query {
2022+
query {
20232023
friendList @stream(initialCount: 1, label:"stream-label") {
20242024
...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
20252025
id
@@ -2131,7 +2131,7 @@ describe('Execute: stream directive', () => {
21312131
};
21322132

21332133
const document = parse(`
2134-
query {
2134+
query {
21352135
friendList @stream(initialCount: 1) {
21362136
id
21372137
... @defer {
@@ -2191,7 +2191,7 @@ describe('Execute: stream directive', () => {
21912191
};
21922192

21932193
const document = parse(`
2194-
query {
2194+
query {
21952195
friendList @stream(initialCount: 1) {
21962196
name
21972197
id
@@ -2250,7 +2250,7 @@ describe('Execute: stream directive', () => {
22502250
}),
22512251
};
22522252
const document = parse(`
2253-
query {
2253+
query {
22542254
friendList @stream(initialCount: 1) {
22552255
... @defer {
22562256
name

src/utilities/__tests__/printSchema-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ describe('Type System Printer', () => {
663663
schema {
664664
query: Query
665665
}
666-
666+
667667
""""""
668668
directive @someDirective(
669669
""""""

0 commit comments

Comments
 (0)