Skip to content

Commit 0409102

Browse files
authored
Merge pull request #1 from rfgamaral/feature/improve-jest-detection
Feature/improve jest detection
2 parents abb04b0 + 378c795 commit 0409102

5 files changed

Lines changed: 19 additions & 22 deletions

File tree

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"name": "Debug Tests",
88
"program": "${workspaceRoot}/node_modules/jest/bin/jest.js",
99
"cwd": "${workspaceRoot}",
10-
"args": ["--i", "--config", "jest.json"]
10+
"args": ["--i", "--config", "jest.config.js"]
1111
},
1212
{
1313
"name": "Launch Extension (development)",

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"tasks": [
44
{
55
"label": "watch",
6-
"type": "npm",
7-
"script": "watch",
6+
"type": "shell",
7+
"command": "yarn run watch",
88
"isBackground": true,
99
"problemMatcher": [
1010
{

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Bug-fixes within the same version aren't needed
55
66
## Master
77
8+
* Add 'hair space' (U+200A) after decoration text - [@rfgamaral](https://github.com/rfgamaral)
9+
* Fix decoration color for 'unknown' tests - [@rfgamaral](https://github.com/rfgamaral)
810
* Improve global and local detection for Jest executable on `win32` platform - [@rfgamaral](https://github.com/rfgamaral)
911
* Set `"extensionKind": "workspace"` in `package.json` to support remote developement - [@rfgamaral](https://github.com/rfgamaral)
10-
* Activate extension if workspace contains either 'jest' or 'jest.cmd' executable - [@rfgamaral](https://github.com/rfgamaral)
1112
1213
-->
1314

src/decorations.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ export function failingItName() {
77
light: {
88
before: {
99
color: '#FF564B',
10-
contentText: '●',
10+
contentText: '●',
1111
},
1212
},
1313
dark: {
1414
before: {
1515
color: '#AD322D',
16-
contentText: '●',
16+
contentText: '●',
1717
},
1818
},
1919
rangeBehavior: DecorationRangeBehavior.ClosedClosed,
@@ -27,13 +27,13 @@ export function skipItName() {
2727
light: {
2828
before: {
2929
color: '#fed37f',
30-
contentText: '○',
30+
contentText: '○',
3131
},
3232
},
3333
dark: {
3434
before: {
3535
color: '#fed37f',
36-
contentText: '○',
36+
contentText: '○',
3737
},
3838
},
3939
rangeBehavior: DecorationRangeBehavior.ClosedClosed,
@@ -47,13 +47,13 @@ export function passingItName() {
4747
light: {
4848
before: {
4949
color: '#3BB26B',
50-
contentText: '●',
50+
contentText: '●',
5151
},
5252
},
5353
dark: {
5454
before: {
5555
color: '#2F8F51',
56-
contentText: '●',
56+
contentText: '●',
5757
},
5858
},
5959
rangeBehavior: DecorationRangeBehavior.ClosedClosed,
@@ -66,14 +66,14 @@ export function notRanItName() {
6666
overviewRulerLane: OverviewRulerLane.Left,
6767
dark: {
6868
before: {
69-
color: '#3BB26B',
70-
contentText: '○',
69+
color: '#9C9C9C',
70+
contentText: '○',
7171
},
7272
},
7373
light: {
7474
before: {
75-
color: '#2F8F51',
76-
contentText: '○',
75+
color: '#7C7C7C',
76+
contentText: '○',
7777
},
7878
},
7979
rangeBehavior: DecorationRangeBehavior.ClosedClosed,

yarn.lock

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3797,14 +3797,10 @@ lodash.sortby@^4.7.0:
37973797
version "4.7.0"
37983798
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
37993799

3800-
lodash@^4.13.1, lodash@^4.17.4:
3801-
version "4.17.5"
3802-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
3803-
3804-
lodash@^4.17.11:
3805-
version "4.17.11"
3806-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
3807-
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
3800+
lodash@^4.13.1, lodash@^4.17.11, lodash@^4.17.4:
3801+
version "4.17.14"
3802+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
3803+
integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
38083804

38093805
log-driver@^1.2.5:
38103806
version "1.2.7"

0 commit comments

Comments
 (0)