ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix jest tests timing out in jenkins 

Change-Id: I594d05c5375b20d9eff78487c1a84023ad65e438
Reviewed-on: https://gerrit.instructure.com/184792
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Jon Willesen 2019-03-11 11:06:37 -06:00 committed by Jon Willesen
parent f49b3a77b1
commit 60df2bed3a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/jsx/assignments_2/teacher/test-utils.js
View File

@ -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 */
}

2
package.json
View File

@ -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",