Skip to content

Commit

Permalink
Update tests to account for the AbortController global being defined …
Browse files Browse the repository at this point in the history 
…in Node.js v15+.
  • Loading branch information
@jaydenseric
jaydenseric committed Nov 8, 2020
1 parent b44ff32 commit 7d8cd30
Show file tree
Hide file tree
Showing 2 changed files with 116 additions and 32 deletions.
1 change: 1 addition & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Removed the [`subscriptions-transport-ws`](https://npm.im/subscriptions-transport-ws) peer dependency, via [#235](https://github.com/jaydenseric/apollo-upload-client/pull/235).
- Updated dependencies.
- Also run GitHub Actions with Node.js v15.
- Updated tests to account for the `AbortController` global being defined in Node.js v15+.

## 14.1.2

Expand Down
147 changes: 115 additions & 32 deletions test/public/createUploadLink.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,17 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, defaultUri);
deepStrictEqual(fetchOptions, {

const {
signal: fetchOptionsSignal,
...fetchOptionsRest
} = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -117,16 +127,19 @@ module.exports = (tests) => {
strictEqual(fetchUri, defaultUri);
strictEqual(typeof fetchOptions, 'object');

const { body, ...fetchOptionsWithoutBody } = fetchOptions;
const {
signal: fetchOptionsSignal,
body: fetchOptionsBody,
...fetchOptionsRest
} = fetchOptions;

deepStrictEqual(fetchOptionsWithoutBody, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
strictEqual(body instanceof FormData, true);
// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

strictEqual(fetchOptionsBody instanceof FormData, true);

const formDataEntries = Array.from(body.entries());
const formDataEntries = Array.from(fetchOptionsBody.entries());

strictEqual(formDataEntries.length, 3);
strictEqual(formDataEntries[0][0], 'operations');
Expand All @@ -142,6 +155,11 @@ module.exports = (tests) => {
strictEqual(formDataEntries[2][1] instanceof Blob, true);
strictEqual(formDataEntries[2][1].name, 'blob');
strictEqual(formDataEntries[2][1].type, filetype);
deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
deepStrictEqual(nextData, payload);
} finally {
revertGlobals();
Expand Down Expand Up @@ -191,7 +209,14 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, uri);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -247,7 +272,14 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, defaultUri);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -308,7 +340,14 @@ module.exports = (tests) => {
fetchUri,
`${defaultUri}?query=%7B%0A%20%20a%0A%7D%0A&variables=%7B%7D`
);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'GET',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -363,7 +402,14 @@ module.exports = (tests) => {
fetchUri,
`${defaultUri}?query=%7B%0A%20%20a%0A%7D%0A&variables=%7B%7D`
);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'GET',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -424,16 +470,19 @@ module.exports = (tests) => {
strictEqual(fetchUri, defaultUri);
strictEqual(typeof fetchOptions, 'object');

const { body, ...fetchOptionsWithoutBody } = fetchOptions;
const {
signal: fetchOptionsSignal,
body: fetchOptionsBody,
...fetchOptionsRest
} = fetchOptions;

deepStrictEqual(fetchOptionsWithoutBody, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
strictEqual(body instanceof FormData, true);
// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

strictEqual(fetchOptionsBody instanceof FormData, true);

const formDataEntries = Array.from(body.entries());
const formDataEntries = Array.from(fetchOptionsBody.entries());

strictEqual(formDataEntries.length, 3);
strictEqual(formDataEntries[0][0], 'operations');
Expand All @@ -449,6 +498,11 @@ module.exports = (tests) => {
strictEqual(formDataEntries[2][1] instanceof Blob, true);
strictEqual(formDataEntries[2][1].name, 'blob');
strictEqual(formDataEntries[2][1].type, filetype);
deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
deepStrictEqual(nextData, payload);
} finally {
revertGlobals();
Expand Down Expand Up @@ -554,7 +608,14 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, defaultUri);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*', 'content-type': 'application/json' },
credentials: undefined,
Expand Down Expand Up @@ -611,7 +672,14 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, defaultUri);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: {
accept: '*/*',
Expand Down Expand Up @@ -682,7 +750,14 @@ module.exports = (tests) => {
);

strictEqual(fetchUri, defaultUri);
deepStrictEqual(fetchOptions, {

const { signal: fetchOptionsSignal, ...fetchOptionsRest } = fetchOptions;

// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: {
accept: '*/*',
Expand Down Expand Up @@ -761,16 +836,19 @@ module.exports = (tests) => {
strictEqual(fetchUri, defaultUri);
strictEqual(typeof fetchOptions, 'object');

const { body, ...fetchOptionsWithoutBody } = fetchOptions;
const {
signal: fetchOptionsSignal,
body: fetchOptionsBody,
...fetchOptionsRest
} = fetchOptions;

deepStrictEqual(fetchOptionsWithoutBody, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
strictEqual(body instanceof FormData, true);
// Defined in Node.js v15+.
if (global.AbortSignal)
strictEqual(fetchOptionsSignal instanceof global.AbortSignal, true);

strictEqual(fetchOptionsBody instanceof FormData, true);

const formDataEntries = Array.from(body.entries());
const formDataEntries = Array.from(fetchOptionsBody.entries());

strictEqual(formDataEntries.length, 3);
strictEqual(formDataEntries[0][0], 'operations');
Expand All @@ -786,6 +864,11 @@ module.exports = (tests) => {
strictEqual(formDataEntries[2][1] instanceof Blob, true);
strictEqual(formDataEntries[2][1].name, 'blob');
strictEqual(formDataEntries[2][1].type, filetype);
deepStrictEqual(fetchOptionsRest, {
method: 'POST',
headers: { accept: '*/*' },
credentials: undefined,
});
deepStrictEqual(nextData, payload);
}
);
Expand Down

0 comments on commit 7d8cd30

Please sign in to comment.