diff --git a/app/jsx/assignments_2/teacher/test-utils.js b/app/jsx/assignments_2/teacher/test-utils.js index ad68480a5f0..97313424651 100644 --- a/app/jsx/assignments_2/teacher/test-utils.js +++ b/app/jsx/assignments_2/teacher/test-utils.js @@ -222,9 +222,8 @@ export function itBehavesLikeADialog({ confirmDialogOpen, getCancelDialogElt }) { - /* eslint-disable jest/no-disabled-tests */ // skipped because the close tests regularly timeout in jenkins - describe.skip('behaves like a dialog', () => { + describe('behaves like a dialog', () => { async function openTheDialog() { const fns = await render() const openDialogTrigger = getOpenDialogElt(fns) @@ -251,5 +250,4 @@ export function itBehavesLikeADialog({ expect(await waitForNoElement(() => confirmDialogOpen(fns))).toBe(true) }) }) - /* eslint-enable jest/no-disabled-tests */ } diff --git a/package.json b/package.json index 6a6a4c259d1..f16daa962d2 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,7 @@ }, "repository": "instructure/canvas-lms", "scripts": { - "test": "concurrently --names \"packages,jest,karma\" \"yarn test:packages\" \"if [ \"$COVERAGE\" ]; then yarn test:jest:coverage; else yarn test:jest; fi\" \"if [ \"$COVERAGE\" ]; then yarn test:karma; else yarn test:karma:concurrently; fi\"", + "test": "concurrently --names \"packages,jest,karma\" \"yarn test:packages\" \"if [ \"$COVERAGE\" ]; then yarn test:jest:coverage --maxWorkers 1; else yarn test:jest --maxWorkers 1; fi\" \"if [ \"$COVERAGE\" ]; then yarn test:karma; else yarn test:karma:concurrently; fi\"", "test:coverage": "script/generate_js_coverage", "test:watch": "concurrently --names \"jest,karma\" \"jest --watch .\" \"yarn test:karma:watch\"", "test:jest": "jest --color",