Skip to content

refactor(auth): migrate fxa-auth-server tests from sinon/proxyquire #20366

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

Open
vbudhram wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(auth): migrate fxa-auth-server tests from sinon/proxyquire #20366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/fxa-auth-server/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
rootDir: '.',
modulePathIgnorePatterns: ['<rootDir>/dist/'],
testMatch: [
'<rootDir>/lib/**/*.spec.ts',
'<rootDir>/config/**/*.spec.ts',
Expand All @@ -29,7 +30,7 @@ module.exports = {
maxWorkers: 4,
clearMocks: true,
workerIdleMemoryLimit: '512MB',
setupFiles: ['<rootDir>/jest.setup.js', '<rootDir>/jest.setup-proxyquire.js'],
setupFiles: ['<rootDir>/jest.setup.js', '<rootDir>/jest.setup-resolve.js'],
testPathIgnorePatterns: ['\\.in\\.spec\\.ts$'],
// Coverage configuration (enabled via --coverage flag)
collectCoverageFrom: [
Expand Down
7 changes: 4 additions & 3 deletions .../fxa-auth-server/jest.setup-proxyquire.js → ...ges/fxa-auth-server/jest.setup-resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

/**
* Fix for proxyquire not finding .ts files under Jest/ts-jest.
* proxyquire uses resolve.sync() which defaults to only .js extensions.
* Fix for module resolution not finding .ts files under Jest/ts-jest.
* resolve.sync() defaults to only .js extensions, which breaks jest.mock()
* for modules that resolve to .ts index files (e.g. fxa-shared/db/models/auth).
* This patches resolve.sync to also look for .ts files.
*/

const resolve = require('resolve');
const originalSync = resolve.sync;
resolve.sync = function(id, opts) {
resolve.sync = function (id, opts) {
opts = opts || {};
if (!opts.extensions || opts.extensions.length === 0) {
opts.extensions = ['.ts', '.tsx', '.js', '.json', '.node'];
Expand Down
Loading