Skip to content

Commit f326350

Browse files
authored
Merge pull request #25 from badsyntax/tests
Add fix for windows with e2e tests
2 parents 45c425f + 3ef838d commit f326350

24 files changed

+15861
-4037
lines changed

.github/workflows/main.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,46 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
os:
15+
- ubuntu-latest
16+
- macos-latest
17+
- windows-latest
18+
vscodeVersion:
19+
- 1.64.2
20+
- stable
21+
runs-on: ${{ matrix.os }}
1322
name: Build
1423
steps:
1524
- uses: actions/checkout@v3
16-
- name: Use Node ${{ matrix.node-version }}
25+
- name: Setup Node.js
1726
uses: actions/[email protected]
1827
with:
1928
node-version: 16
29+
- name: Setup dotnet
30+
uses: actions/setup-dotnet@v3
31+
with:
32+
dotnet-version: '7.x.x'
2033
- name: Install NPM Packages
2134
run: npm ci
2235
- name: Lint
2336
run: npm run lint
2437
- name: Build
2538
run: npm run package
39+
- name: Prepare test project
40+
run: |
41+
dotnet tool restore
42+
dotnet build
43+
dotnet ef --version
44+
working-directory: ./sample_dotnet
45+
- name: Test
46+
run: |
47+
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
48+
npm test
49+
env:
50+
DISPLAY: ':99.0'
51+
VSCODE_VERSION: ${{ matrix.vscodeVersion }}
2652

2753
publish:
2854
name: Publish

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ node_modules
44
.vscode-test/
55
*.vsix
66
.DS_Store
7+
.wdio-vscode-service

.prettierignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
node_modules
22
.vscode-test
33
package-lock.json
4-
dist/
5-
sample_dotnet/
4+
dist
5+
sample_dotnet
6+
.wdio-vscode-service
7+
out

.vscode/launch.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,11 @@
1111
},
1212
{
1313
"name": "Extension Tests",
14-
"type": "extensionHost",
1514
"request": "launch",
16-
"args": [
17-
"--extensionDevelopmentPath=${workspaceFolder}",
18-
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
19-
],
20-
"outFiles": [
21-
"${workspaceFolder}/out/**/*.js",
22-
"${workspaceFolder}/dist/**/*.js"
23-
],
24-
"preLaunchTask": "tasks: watch-tests"
15+
"runtimeArgs": ["run-script", "wdio"],
16+
"runtimeExecutable": "npm",
17+
"skipFiles": ["<node_internals>/**"],
18+
"type": "node"
2519
}
2620
]
2721
}

.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
"entityframework",
5454
"NLCR",
5555
"Pseudoterminal",
56-
"richardwillis"
56+
"richardwillis",
57+
"Testrunner",
58+
"waitfor",
59+
"wdio",
60+
"Xvfb"
5761
]
5862
}

.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ webpack.config.js
1717
.github/**
1818
images/**
1919
sample_dotnet/**
20+
.wdio-vscode-service/**

0 commit comments

Comments
 (0)