Skip to content

Commit 13286bf

Browse files
committed
wip: refactor vscode integration tests
1 parent 64d234e commit 13286bf

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

ci/dev/test-integration.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,26 @@ main() {
3232
popd
3333
fi
3434

35+
# TODO@jsjoeio get this working like in test-unit.sh
36+
# ln -s "/usr/local/Cellar/code-server/4.7.0/libexec/lib/vscode/out" ./lib/vscode/out
37+
# source ./ci/lib.sh
38+
39+
# Our code imports from `out` in order to work during development but if you
40+
# have only built for production you will have not have this directory. In
41+
# that case symlink `out` to a production build directory.
42+
# if [[ ! -e lib/vscode/out ]]; then
43+
# pushd lib
44+
# local out=(vscode-reh-web-*)
45+
# if [[ -d "${out[0]}" ]]; then
46+
# ln -s "../${out[0]}/out" ./vscode/out
47+
# else
48+
# echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
49+
# echo "Code must be built before running unit tests"
50+
# # exit 1
51+
# fi
52+
# popd
53+
# fi
54+
3555
echo "Running tests with code-server binary: '$path'"
3656

3757
if [[ ! -f $path ]]; then

test/unit/node/routes/vscode.test.ts renamed to test/integration/vscode.test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { promises as fs } from "fs"
22
import * as path from "path"
3-
import { clean, tmpdir } from "../../../utils/helpers"
4-
import * as httpserver from "../../../utils/httpserver"
5-
import * as integration from "../../../utils/integration"
3+
import { clean, tmpdir } from "../utils/helpers"
4+
import * as httpserver from "../utils/httpserver"
5+
import * as integration from "../utils/integration"
66

7-
// TODO@jsjoeio - move these to integration tests since they rely on Code
8-
// to be built
7+
// TODO@jsjoeio - remove skip when script fixed
98
describe.skip("vscode", () => {
109
let codeServer: httpserver.HttpServer | undefined
1110

0 commit comments

Comments
 (0)