Merge pull request #4702 from JoeRobich/fix-project-selector

Fix integration tests

Author: JoeRobich

src/omnisharp/launcher.ts

@@ -195,7 +195,7 @@ export function resourcesAndFolderMapToLaunchTargets(resources: vscode.Uri[], wo
         if ((hasCsProjFiles && !hasSlnFile) || (hasProjectJson && !hasProjectJsonAtRoot)) {
             projectRootTargets.push({
                 label: path.basename(folderPath),
-                description: '',
+                description: 'All contained projects',
                 target: folderPath,
                 directory: folderPath,
                 kind: LaunchTargetKind.Folder

src/omnisharp/server.ts

@@ -551,15 +551,21 @@ export class OmniSharpServer {
             }
 
             // If there's more than one launch target, we start the server if one of the targets
-            // matches the preferred path. Otherwise, we fire the "MultipleLaunchTargets" event,
-            // which is handled in status.ts to display the launch target selector.
+            // matches the preferred path.
             if (preferredPath) {
                 const preferredLaunchTarget = launchTargets.find((a) => a.target === preferredPath);
                 if (preferredLaunchTarget) {
                     return this.restart(preferredLaunchTarget);
                 }
             }
 
+            // When running integration tests, open the first launch target.
+            if (process.env.RUNNING_INTEGRATION_TESTS === "true") {
+                return this.restart(launchTargets[0]);
+            }
+
+            // Otherwise, we fire the "MultipleLaunchTargets" event,
+            // which is handled in status.ts to display the launch target selector.
             this._fireEvent(Events.MultipleLaunchTargets, launchTargets);
             return showProjectSelector(this, launchTargets);
         });

test/integrationTests/index.ts

@@ -7,6 +7,8 @@ import * as path from 'path';
 import * as testRunner from '../testRunner';
 
 export async function run() {
+    process.env.RUNNING_INTEGRATION_TESTS = "true";
+
     return testRunner.run(
         path.resolve(__dirname, '.'),
         {