Skip to content

Commit 4bd347b

Browse files
committed
fix: resolve Jest hangs with --forceExit and graphql indentation via tests/vimrc shiftwidth override
1 parent 42f382a commit 4bd347b

3 files changed

Lines changed: 31 additions & 30 deletions

File tree

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"url": "git://github.com/prettier/vim-prettier.git"
1010
},
1111
"scripts": {
12-
"test": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=all node scripts/jest.js",
13-
"test:smoke": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=all node scripts/jest.js tests/formatting.test.js --runInBand --testNamePattern=\"Prettier config|Prettier command shell\"",
14-
"test:formatting:core": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=core node scripts/jest.js tests/formatting.test.js --runInBand",
15-
"test:formatting:core:exec": "node scripts/vim-version.js && node -e \"if (!process.env.PRETTIER_EXEC_CMD_PATH) { console.error('Set PRETTIER_EXEC_CMD_PATH to a Prettier executable'); process.exit(1); }\" && LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=core node scripts/jest.js tests/formatting.test.js --runInBand",
16-
"test:formatting:passing": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=known-passing node scripts/jest.js tests/formatting.test.js --runInBand",
17-
"test:formatting:quarantined": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=quarantined node scripts/jest.js tests/formatting.test.js --runInBand",
12+
"test": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=all node scripts/jest.js --forceExit",
13+
"test:smoke": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=all node scripts/jest.js tests/formatting.test.js --runInBand --testNamePattern=\"Prettier config|Prettier command shell\" --forceExit",
14+
"test:formatting:core": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=core node scripts/jest.js tests/formatting.test.js --runInBand --forceExit",
15+
"test:formatting:core:exec": "node scripts/vim-version.js && node -e \"if (!process.env.PRETTIER_EXEC_CMD_PATH) { console.error('Set PRETTIER_EXEC_CMD_PATH to a Prettier executable'); process.exit(1); }\" && LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=core node scripts/jest.js tests/formatting.test.js --runInBand --forceExit",
16+
"test:formatting:passing": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=known-passing node scripts/jest.js tests/formatting.test.js --runInBand --forceExit",
17+
"test:formatting:quarantined": "node scripts/vim-version.js && PRETTIER_EXEC_CMD_PATH= LOG_LEVEL=error PRETTIER_FORMATTING_FIXTURE_LANE=quarantined node scripts/jest.js tests/formatting.test.js --runInBand --forceExit",
1818
"test:editors:docker": "sh scripts/docker-editor-matrix.sh all",
1919
"lint": "sh scripts/vint.sh --version && sh scripts/vint.sh ."
2020
},

tests/__snapshots__/formatting.test.js.snap

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@ exports[`Prettier formats foo.css file with :PrettierAsync command 1`] = `
2020

2121
exports[`Prettier formats foo.graphql file with :Prettier command 1`] = `
2222
"{
23-
baz {
24-
blah
25-
...name
26-
}
27-
bean {
28-
foo
29-
blah
30-
bleh
31-
}
32-
bar {
33-
...name
34-
}
23+
baz {
24+
blah
25+
...name
26+
}
27+
bean {
28+
foo
29+
blah
30+
bleh
31+
}
32+
bar {
33+
...name
34+
}
3535
}"
3636
`;
3737

3838
exports[`Prettier formats foo.graphql file with :PrettierAsync command 1`] = `
3939
"{
40-
baz {
41-
blah
42-
...name
43-
}
44-
bean {
45-
foo
46-
blah
47-
bleh
48-
}
49-
bar {
50-
...name
51-
}
40+
baz {
41+
blah
42+
...name
43+
}
44+
bean {
45+
foo
46+
blah
47+
bleh
48+
}
49+
bar {
50+
...name
51+
}
5252
}"
5353
`;
5454

tests/vimrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ set tabstop=4
3232
set softtabstop=4
3333
set shiftwidth=4
3434
set expandtab
35+
autocmd FileType graphql setlocal shiftwidth=4 tabstop=4 softtabstop=4
3536
set backspace=2
3637
set nofoldenable
3738
set foldmethod=syntax

0 commit comments

Comments
 (0)