Correct code and test the main scenario

microsoft · Apr 9, 2019 · 230b5fe · 230b5fe
1 parent 272b565
commit 230b5fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts b/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts
@@ -64,7 +64,6 @@ export class VirtualEnvironmentPrompt implements IExtensionActivationService {
     protected hasUserDefinedPythonPath(resource?: Uri) {
         const settings = this.workspaceService.getConfiguration('python', resource)!.inspect<string>('pythonPath')!;
         return ((settings.workspaceFolderValue && settings.workspaceFolderValue !== 'python') ||
-            (settings.workspaceValue && settings.workspaceValue !== 'python') ||
-            (settings.globalValue && settings.globalValue !== 'python')) ? true : false;
+            (settings.workspaceValue && settings.workspaceValue !== 'python')) ? true : false;
     }
 }
diff --git a/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts b/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts
@@ -88,11 +88,11 @@ suite('Virtual Environment Prompt', () => {
         workspaceConfig.verifyAll();
     });
 
-    test('User is notified if interpreter exists and python path is not specified in settings.json', async () => {
+    test('User is notified if interpreter exists and only python path to global interpreter is specified in settings', async () => {
         const resource = Uri.file('a');
         const interpreter1 = { path: 'path/to/interpreter1' };
         const interpreter2 = { path: 'path/to/interpreter2' };
-        const settings = { workspaceFolderValue: 'python' };
+        const settings = { workspaceFolderValue: 'python', globalValue: 'path/to/globalInterpreter' };
         const prompts = [InteractiveShiftEnterBanner.bannerLabelYes(), InteractiveShiftEnterBanner.bannerLabelNo(), Interpreters.doNotShowAgain()];
         const notificationPromptEnabled = TypeMoq.Mock.ofType<IPersistentState<boolean>>();
         const workspaceConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
@@ -213,9 +213,9 @@ suite('Virtual Environment Prompt', () => {
                 expectedResult: false
             },
             {
-                testName: 'Returns true when interpreter is provided in global setting',
+                testName: 'Returns false when interpreter is provided in global setting',
                 settings: { globalValue: 'path/to/interpreter' },
-                expectedResult: true
+                expectedResult: false
             },
             {
                 testName: 'Returns false when no python setting is provided',