Make tests pass

dotnet · Aug 28, 2018 · f3c9473 · f3c9473
1 parent 3c5e3ab
commit f3c9473
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
 - "8"
 
 env:
-- CODE_VERSION=1.26.1
+- CODE_VERSION=1.26.0
 
 before_install:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then

diff --git a/test/integrationTests/completionItemProvider.integration.test.ts b/test/integrationTests/completionItemProvider.integration.test.ts
@@ -5,23 +5,20 @@
 
 import OmniSharpCompletionItemProvider from "../../src/features/completionItemProvider";
 import * as vscode from 'vscode';
-import CSharpExtensionExports from "../../src/CSharpExtensionExports";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import * as path from "path";
 import { expect } from "chai";
+import { activateCSharpExtension } from "./integrationHelpers";
 
 suite(`${OmniSharpCompletionItemProvider.name}: Returns the completion items`, () => {
     let fileUri: vscode.Uri;
 
     suiteSetup(async () => {
-        let csharpExtension = vscode.extensions.getExtension<CSharpExtensionExports>("ms-vscode.csharp");
-        if (!csharpExtension.isActive) {
-            await csharpExtension.activate();
-        }
+        await testAssetWorkspace.restore();
+        await activateCSharpExtension();
 
-        await csharpExtension.exports.initializationFinished();
         let fileName = 'completion.cs';
-        let dir = path.dirname(testAssetWorkspace.projects[0].projectDirectoryPath);
+        let dir = testAssetWorkspace.projects[0].projectDirectoryPath;
         fileUri = vscode.Uri.file(path.join(dir, fileName));
         await vscode.commands.executeCommand("vscode.open", fileUri);
     });