diff options
author | Rob Lourens <roblourens@gmail.com> | 2022-02-02 05:22:46 +0300 |
---|---|---|
committer | Rob Lourens <roblourens@gmail.com> | 2022-02-02 05:22:57 +0300 |
commit | bb79477f2e2ab51fe9c61d00d5a56c1bf777d0fb (patch) | |
tree | b3e9436423288c868a45f55b4c9b8a0d0a956d1c | |
parent | f498b374c03be09cf664a7fefa1c1c95a0c7216d (diff) |
Enable ipynb serializer tests in web integration tests
and reenable NotebookSerializer test in non-web
-rw-r--r-- | extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts | 4 | ||||
-rw-r--r-- | extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts | 2 | ||||
-rwxr-xr-x | scripts/test-web-integration.sh | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts index fff6e06ab16..44359de5e84 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts @@ -7,8 +7,8 @@ import * as assert from 'assert'; import 'mocha'; import * as vscode from 'vscode'; -suite('ipynb NotebookSerializer', function () { - test.skip('Can open an ipynb notebook', async () => { +(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('ipynb NotebookSerializer', function () { + test('Can open an ipynb notebook', async () => { assert.ok(vscode.workspace.workspaceFolders); const workspace = vscode.workspace.workspaceFolders[0]; const uri = vscode.Uri.joinPath(workspace.uri, 'test.ipynb'); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts index 5c5d0c88143..f6e8ff67fc0 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts @@ -136,7 +136,7 @@ const apiTestContentProvider: vscode.NotebookContentProvider = { } }; -(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook API tests', function () { +suite('Notebook API tests', function () { const testDisposables: vscode.Disposable[] = []; const suiteDisposables: vscode.Disposable[] = []; diff --git a/scripts/test-web-integration.sh b/scripts/test-web-integration.sh index b84e8c51d2f..f1b6c7683ac 100755 --- a/scripts/test-web-integration.sh +++ b/scripts/test-web-integration.sh @@ -24,6 +24,7 @@ else compile-extension:typescript-language-features \ compile-extension:emmet \ compile-extension:git \ + compile-extension:ipynb \ compile-extension-media fi @@ -63,3 +64,9 @@ echo echo "### Git tests" echo node test/integration/browser/out/index.js --workspacePath $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test "$@" + +echo +echo "### Ipynb tests" +echo +node test/integration/browser/out/index.js --workspacePath $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.ipynb --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test "$@" + |