c.environmentVariableCollection.replace is not a function?

anthonykim1 · Sep 21, 2024 · 32edc64 · 32edc64
1 parent b72fe78
commit 32edc64
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -90,7 +90,7 @@
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
             "env": {
-                "VSC_PYTHON_CI_TEST_GREP": "" // Modify this to run a subset of the single workspace tests
+                "VSC_PYTHON_CI_TEST_GREP": "PYTHONSTARTUP is set when setting is enabled" // Modify this to run a subset of the single workspace tests
             },
             "sourceMaps": true,
             "outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],

diff --git a/src/test/repl/variableProvider.test.ts b/src/test/repl/variableProvider.test.ts
@@ -8,7 +8,7 @@ import { IVariableDescription } from '../../client/repl/variables/types';
 import { VariablesProvider } from '../../client/repl/variables/variablesProvider';
 import { VariableRequester } from '../../client/repl/variables/variableRequester';
 
-suite.only('ReplVariablesProvider', () => {
+suite('ReplVariablesProvider', () => {
     let provider: VariablesProvider;
     let varRequester: TypeMoq.IMock<VariableRequester>;
     let notebook: TypeMoq.IMock<NotebookDocument>;

diff --git a/src/test/terminals/shellIntegration/pythonStartup.test.ts b/src/test/terminals/shellIntegration/pythonStartup.test.ts
@@ -2,7 +2,12 @@
 // Licensed under the MIT License.
 import * as sinon from 'sinon';
 import * as TypeMoq from 'typemoq';
-import { EnvironmentVariableCollection, GlobalEnvironmentVariableCollection, WorkspaceConfiguration } from 'vscode';
+import {
+    EnvironmentVariableCollection,
+    GlobalEnvironmentVariableCollection,
+    Uri,
+    WorkspaceConfiguration,
+} from 'vscode';
 import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
 import { registerPythonStartup } from '../../../client/terminals/pythonStartup';
 import { IExtensionContext } from '../../../client/common/types';
@@ -20,12 +25,20 @@ suite('Terminal - Shell Integration with PYTHONSTARTUP', () => {
     let globalEnvironmentVariableCollection: TypeMoq.IMock<GlobalEnvironmentVariableCollection>;
     setup(() => {
         context = TypeMoq.Mock.ofType<IExtensionContext>();
-        context.setup((c) => c).returns(() => context.object);
+        // context.setup((c) => c).returns(() => context.object);
         environmentVariableCollection = TypeMoq.Mock.ofType<EnvironmentVariableCollection>();
         globalEnvironmentVariableCollection = TypeMoq.Mock.ofType<GlobalEnvironmentVariableCollection>();
+
         context.setup((c) => c.environmentVariableCollection).returns(() => globalEnvironmentVariableCollection.object);
-        // setup context.environmentVariableCollection when delete method is called
-        globalEnvironmentVariableCollection.setup((c) => c.delete(TypeMoq.It.isAny())).returns(() => undefined);
+        globalEnvironmentVariableCollection
+            .setup((c) => c.getScoped(TypeMoq.It.isAny()))
+            .returns(() => environmentVariableCollection.object);
+        context.setup((c) => c.storageUri).returns(() => Uri.parse('a'));
+        context
+            .setup((c) =>
+                c.environmentVariableCollection.replace(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()),
+            )
+            .returns(() => Promise.resolve());
 
         getConfigurationStub = sinon.stub(workspaceApis, 'getConfiguration');
         createDirectoryStub = sinon.stub(workspaceApis, 'createDirectory');
@@ -58,5 +71,6 @@ suite('Terminal - Shell Integration with PYTHONSTARTUP', () => {
             (c) => c.environmentVariableCollection.replace(TypeMoq.It.isAny(), TypeMoq.It.isAny()),
             TypeMoq.Times.once(),
         );
+        // context.verify((c) => c.environmentVariableCollection.delete(TypeMoq.It.isAny()), TypeMoq.Times.never());
     });
 });