diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts index 7577cd6a718..8a9a3a93b15 100644 --- a/extensions/emmet/src/test/abbreviationAction.test.ts +++ b/extensions/emmet/src/test/abbreviationAction.test.ts @@ -46,7 +46,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => { const oldValueForInlcudeLanguages = workspace.getConfiguration('emmet').inspect('includeLanguages'); teardown(() => { // close all editors - return closeAllEditors; + return closeAllEditors(); }); test('Expand snippets (HTML)', () => { diff --git a/extensions/emmet/src/test/completion.test.ts b/extensions/emmet/src/test/completion.test.ts index 91844f69f24..cec90a569ee 100644 --- a/extensions/emmet/src/test/completion.test.ts +++ b/extensions/emmet/src/test/completion.test.ts @@ -14,7 +14,7 @@ const completionProvider = new DefaultCompletionItemProvider(); suite('Tests for completion in CSS embedded in HTML', () => { teardown(() => { // close all editors - return closeAllEditors; + return closeAllEditors(); }); test('style attribute & attribute value in html', async () => { diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts index 8c217bf3cbd..9d9203905e4 100644 --- a/extensions/emmet/src/test/tagActions.test.ts +++ b/extensions/emmet/src/test/tagActions.test.ts @@ -16,7 +16,7 @@ import { mergeLines } from '../mergeLines'; suite('Tests for Emmet actions on html tags', () => { teardown(() => { // close all editors - return closeAllEditors; + return closeAllEditors(); }); const contents = ` diff --git a/extensions/emmet/src/test/test-fixtures/marker.txt b/extensions/emmet/src/test/test-fixtures/marker.txt deleted file mode 100644 index a4c9ad40736..00000000000 --- a/extensions/emmet/src/test/test-fixtures/marker.txt +++ /dev/null @@ -1 +0,0 @@ -DO NOT DELETE, USED BY INTEGRATION TESTS diff --git a/extensions/emmet/src/test/test-fixtures/.vscode/settings.json b/extensions/emmet/test-workspace/.vscode/settings.json similarity index 100% rename from extensions/emmet/src/test/test-fixtures/.vscode/settings.json rename to extensions/emmet/test-workspace/.vscode/settings.json diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index 0eeefd80bff..126bba47e1d 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -83,7 +83,7 @@ after_suite "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite -"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/out/test/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/test-workspace --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS