Update dependency supertest to v6 (#9814)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: William Durand <will+git@drnd.me>
This commit is contained in:
renovate[bot] 2020-12-02 16:02:45 +01:00 коммит произвёл GitHub
Родитель fc4acc11d8
Коммит 12c57a9ce2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 70 добавлений и 114 удалений

Просмотреть файл

@ -344,7 +344,7 @@
"stylelint": "^13.0.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-suitcss": "^15.0.0",
"supertest": "^4.0.0",
"supertest": "^6.0.0",
"svg-url-loader": "^7.0.0",
"terser-webpack-plugin": "^4.0.0",
"tmp": "^0.2.0",

Просмотреть файл

@ -53,7 +53,7 @@ describe(__filename, () => {
datadogHost: 'localhost',
datadogPort: 1111,
});
await testClient({ config }).get('/').end();
await testClient({ config }).get('/');
sinon.assert.notCalled(hotShotsClient.timing);
});
@ -64,13 +64,13 @@ describe(__filename, () => {
datadogHost: null,
datadogPort: null,
});
await testClient({ config }).get('/').end();
await testClient({ config }).get('/');
sinon.assert.notCalled(hotShotsClient.timing);
});
it('records timing for GET responses', async () => {
await testClient().get('/').end();
await testClient().get('/');
sinon.assert.calledWith(
hotShotsClient.timing,
@ -80,7 +80,7 @@ describe(__filename, () => {
});
it('records timing for POST responses', async () => {
await testClient().post('/en-US/firefox/something/', {}).end();
await testClient().post('/en-US/firefox/something/', {});
sinon.assert.calledWith(
hotShotsClient.timing,
@ -90,19 +90,19 @@ describe(__filename, () => {
});
it('increments counts for GET responses', async () => {
await testClient().get('/').end();
await testClient().get('/');
sinon.assert.calledWith(hotShotsClient.increment, 'response.GET.count');
});
it('increments counts for POST responses', async () => {
await testClient().post('/en-US/firefox/something/', {}).end();
await testClient().post('/en-US/firefox/something/', {});
sinon.assert.calledWith(hotShotsClient.increment, 'response.POST.count');
});
it('increments response status counts', async () => {
await testClient().get('/').end();
await testClient().get('/');
sinon.assert.calledWith(
hotShotsClient.increment,

Просмотреть файл

@ -139,7 +139,7 @@ describe(__filename, () => {
describe('app', () => {
it('varies on DNT', async () => {
const response = await testClient().get('/en-US/firefox/').end();
const response = await testClient().get('/en-US/firefox/');
expect(response.headers).toMatchObject({ vary: 'DNT' });
expect(response.statusCode).toEqual(200);
@ -165,30 +165,27 @@ describe(__filename, () => {
</div>
);
const response = await testClient({ App: NotFoundApp })
.get('/en-US/firefox/simulation-of-a-non-existent-page/')
.end();
const response = await testClient({ App: NotFoundApp }).get(
'/en-US/firefox/simulation-of-a-non-existent-page/',
);
expect(response.statusCode).toEqual(404);
});
it('sets a Cache-Control header', async () => {
const { store, sagaMiddleware } = createStoreAndSagas();
const response = await testClient({ store, sagaMiddleware })
.get('/en-US/firefox/')
.end();
const response = await testClient({ store, sagaMiddleware }).get(
'/en-US/firefox/',
);
expect(response.headers['cache-control']).toEqual('no-store');
});
it('does not dispatch setAuthToken() if cookie is not found', async () => {
const { store, sagaMiddleware } = createStoreAndSagas();
const response = await testClient({ store, sagaMiddleware })
.get('/en-US/firefox/')
.end();
const response = await testClient({ store, sagaMiddleware }).get(
'/en-US/firefox/',
);
const { api } = store.getState();
expect(response.statusCode).toEqual(200);
@ -200,9 +197,7 @@ describe(__filename, () => {
const { store, sagaMiddleware } = createStoreAndSagas();
const response = await testClient({ store, sagaMiddleware })
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
const { api } = store.getState();
expect(response.statusCode).toEqual(200);
@ -217,9 +212,7 @@ describe(__filename, () => {
.set(
'cookie',
`${defaultConfig.get('dismissedExperienceSurveyCookieName')}=""`,
)
.end();
);
const { survey } = store.getState();
expect(response.statusCode).toEqual(200);
@ -228,10 +221,9 @@ describe(__filename, () => {
it('does not dispatch dismissSurvey() if no cookie is present', async () => {
const { store, sagaMiddleware } = createStoreAndSagas();
const response = await testClient({ store, sagaMiddleware })
.get('/en-US/firefox/')
.end();
const response = await testClient({ store, sagaMiddleware }).get(
'/en-US/firefox/',
);
const { survey } = store.getState();
expect(response.statusCode).toEqual(200);
@ -251,9 +243,7 @@ describe(__filename, () => {
.get('/en-US/firefox/')
// The middleware will honor a request ID header rather than
// generate a new one.
.set(AMO_REQUEST_ID_HEADER, requestId)
.end();
.set(AMO_REQUEST_ID_HEADER, requestId);
sinon.assert.calledWith(dispatchSpy, setRequestId(requestId));
});
@ -267,9 +257,7 @@ describe(__filename, () => {
sagaMiddleware,
})
.get('/en-US/firefox/')
.set(REGION_CODE_HEADER, regionCode)
.end();
.set(REGION_CODE_HEADER, regionCode);
sinon.assert.calledWith(dispatchSpy, setRegionCode(regionCode));
});
@ -280,10 +268,7 @@ describe(__filename, () => {
await testClient({
store,
sagaMiddleware,
})
.get('/en-US/firefox/')
.end();
}).get('/en-US/firefox/');
sinon.assert.neverCalledWith(
dispatchSpy,
setRegionCode(sinon.match.string),
@ -319,9 +304,7 @@ describe(__filename, () => {
appSagas,
})
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
const { api, users, site } = store.getState();
expect(response.statusCode).toEqual(200);
@ -353,10 +336,7 @@ describe(__filename, () => {
store,
sagaMiddleware,
appSagas,
})
.get('/en-US/firefox/')
.end();
}).get('/en-US/firefox/');
const { site } = store.getState();
expect(response.statusCode).toEqual(200);
@ -376,10 +356,7 @@ describe(__filename, () => {
yield all([fork(usersSaga), fork(siteSaga)]);
}
const response = await testClient({ appSagas })
.get('/en-US/firefox/')
.end();
const response = await testClient({ appSagas }).get('/en-US/firefox/');
expect(response.statusCode).toEqual(200);
mockSiteApi.verify();
});
@ -398,9 +375,7 @@ describe(__filename, () => {
appSagas: usersSaga,
})
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
expect(response.statusCode).toEqual(500);
mockUsersApi.verify();
});
@ -426,9 +401,7 @@ describe(__filename, () => {
const response = await client
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
const { api, users } = store.getState();
expect(response.statusCode).toEqual(200);
@ -467,9 +440,7 @@ describe(__filename, () => {
const response = await client
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
const { api, users } = store.getState();
// Parse the HTML response to retrieve the serialized redux state.
@ -518,7 +489,7 @@ describe(__filename, () => {
store,
});
const response = await client.get(`/en-US/firefox/`).end();
const response = await client.get(`/en-US/firefox/`);
expect(response.status).toEqual(301);
expect(response.headers.location).toEqual(newURL);
@ -530,10 +501,9 @@ describe(__filename, () => {
throw new Error('oops');
};
const response = await testClient({ _createHistory, _log })
.get('/en-US/firefox/')
.end();
const response = await testClient({ _createHistory, _log }).get(
'/en-US/firefox/',
);
expect(response.statusCode).toEqual(500);
// Error caught in the main handler.
@ -565,9 +535,7 @@ describe(__filename, () => {
sagaMiddleware,
})
.get(url)
.set('cookie', `${config.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${config.get('cookieName')}="${token}"`);
const { api, site } = store.getState();
// It should not dispatch `setAuthToken()`.
expect(response.statusCode).toEqual(200);
@ -587,9 +555,7 @@ describe(__filename, () => {
sagaMiddleware,
})
.get('/en-US/firefox/')
.set('cookie', `${config.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${config.get('cookieName')}="${token}"`);
const { site } = store.getState();
expect(site.loadedPageIsAnonymous).toEqual(false);
});
@ -606,9 +572,7 @@ describe(__filename, () => {
appSagas: usersSaga,
})
.get('/en-US/firefox/')
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`)
.end();
.set('cookie', `${defaultConfig.get('cookieName')}="${token}"`);
const { api, users } = store.getState();
expect(response.statusCode).toEqual(200);

Просмотреть файл

@ -5499,7 +5499,7 @@ commondir@^1.0.1:
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
component-emitter@^1.2.0, component-emitter@^1.2.1:
component-emitter@^1.2.1, component-emitter@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@ -5623,7 +5623,7 @@ cookie@^0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
cookiejar@^2.1.0:
cookiejar@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==
@ -6129,7 +6129,7 @@ debug@=3.1.0:
dependencies:
ms "2.0.0"
debug@^3.0.0, debug@^3.1.0, debug@^3.2.5:
debug@^3.0.0, debug@^3.2.5:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@ -7849,15 +7849,6 @@ fork-ts-checker-webpack-plugin@^4.1.4:
tapable "^1.0.0"
worker-rpc "^0.1.0"
form-data@^2.3.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.6"
mime-types "^2.1.12"
form-data@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@ -7892,7 +7883,7 @@ formdata-node@^1.5.2:
nanoid "2.0.3"
promise-fs "2.1.1"
formidable@^1.2.0:
formidable@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
@ -11221,7 +11212,7 @@ merge2@^1.2.3, merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
methods@1.1.2, methods@^1.1.2, methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
@ -11314,12 +11305,12 @@ mime@1.4.1:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
mime@1.6.0, mime@^1.4.1:
mime@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mime@^2.4.4:
mime@^2.4.4, mime@^2.4.6:
version "2.4.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
@ -13531,7 +13522,7 @@ qs@6.7.0:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
qs@6.9.4, qs@^6.1.0, qs@^6.5.1, qs@^6.6.0:
qs@6.9.4, qs@^6.1.0, qs@^6.5.1, qs@^6.6.0, qs@^6.9.4:
version "6.9.4"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
@ -14294,7 +14285,7 @@ read-pkg@^5.2.0:
parse-json "^5.0.0"
type-fest "^0.6.0"
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@ -16159,29 +16150,30 @@ sugarss@^2.0.0:
dependencies:
postcss "^7.0.2"
superagent@^3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
dependencies:
component-emitter "^1.2.0"
cookiejar "^2.1.0"
debug "^3.1.0"
extend "^3.0.0"
form-data "^2.3.1"
formidable "^1.2.0"
methods "^1.1.1"
mime "^1.4.1"
qs "^6.5.1"
readable-stream "^2.3.5"
supertest@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/supertest/-/supertest-4.0.2.tgz#c2234dbdd6dc79b6f15b99c8d6577b90e4ce3f36"
integrity sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==
superagent@6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/superagent/-/superagent-6.1.0.tgz#09f08807bc41108ef164cfb4be293cebd480f4a6"
integrity sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==
dependencies:
component-emitter "^1.3.0"
cookiejar "^2.1.2"
debug "^4.1.1"
fast-safe-stringify "^2.0.7"
form-data "^3.0.0"
formidable "^1.2.2"
methods "^1.1.2"
superagent "^3.8.3"
mime "^2.4.6"
qs "^6.9.4"
readable-stream "^3.6.0"
semver "^7.3.2"
supertest@^6.0.0:
version "6.0.1"
resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.0.1.tgz#f6b54370de85c45d6557192c8d7df604ca2c9e18"
integrity sha512-8yDNdm+bbAN/jeDdXsRipbq9qMpVF7wRsbwLgsANHqdjPsCoecmlTuqEcLQMGpmojFBhxayZ0ckXmLXYq7e+0g==
dependencies:
methods "1.1.2"
superagent "6.1.0"
supports-color@^2.0.0:
version "2.0.0"