Pyvenv shouldn't execute activate command

hiroaki-yamamoto · Jan 7, 2017 · d369b6e · d369b6e
1 parent ba889e1
commit d369b6e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/lib/pyvenv.js b/lib/pyvenv.js
@@ -22,7 +22,7 @@ module.exports = (command, searchPath, overwriteDefaultSearchPath) => {
     return fs.existsSync(path.join(el, 'bin', 'activate'));
   });
   let commandToPass = [].concat(
-    path.join(candidatePath[0], 'bin', 'activate'),
+    `. ${path.join(candidatePath[0], 'bin', 'activate')}`,
     command, 'deactivate'
   );
   return promiseProcess(commandToPass);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-process",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Child process that uses Promise Object",
   "main": "index.js",
   "scripts": {

diff --git a/tests/unit/test_pyvenv.js b/tests/unit/test_pyvenv.js
@@ -30,10 +30,10 @@
       });
       it('Should call processCall with proper args.', () => {
         expect(promiseProcessMock.calledOnce).to.be.true;
-        expect(promiseProcessMock.calledWithExactly([
-          path.join(process.cwd(), 'venv', 'bin', 'activate'),
+        expect(promiseProcessMock.getCall(0).args[0]).to.eql([
+          `. ${path.join(process.cwd(), 'venv', 'bin', 'activate')}`,
           testCommand, 'deactivate',
-        ]));
+        ]);
       });
       it('The return value should be an instance of promise', () => {
         expect(ret).to.eql({});
@@ -56,10 +56,10 @@
       });
       it('Should call processCall with proper args.', () => {
         expect(promiseProcessMock.calledOnce).to.be.true;
-        expect(promiseProcessMock.calledWithExactly([].concat(
-          path.join(process.cwd(), 'venv', 'bin', 'activate'),
+        expect(promiseProcessMock.getCall(0).args[0]).to.eql([].concat(
+          `. ${path.join(process.cwd(), 'venv', 'bin', 'activate')}`,
           testCommand, 'deactivate'
-        )));
+        ));
       });
       it('The return value should be an instance of promise', () => {
         expect(ret).to.eql({});
@@ -78,10 +78,10 @@
       });
       it('Should call processCall with proper args.', () => {
         expect(promiseProcessMock.calledOnce).to.be.true;
-        expect(promiseProcessMock.calledWithExactly([
-          path.join('test', 'bin', 'activate'),
+        expect(promiseProcessMock.getCall(0).args[0]).to.eql([
+          `. ${path.join('test', 'bin', 'activate')}`,
           testCommand, 'deactivate',
-        ]));
+        ]);
       });
       it('The return value should be an instance of promise', () => {
         expect(ret).to.eql({});
@@ -100,9 +100,10 @@
       });
       it('Should call processCall with proper args.', () => {
         expect(promiseProcessMock.calledOnce).to.be.true;
-        expect(promiseProcessMock.calledWithExactly([
-          path.join('test', 'bin', 'activate'), testCommand, 'deactivate',
-        ]));
+        expect(promiseProcessMock.getCall(0).args[0]).to.eql([
+          `. ${path.join('test', 'bin', 'activate')}`,
+          testCommand, 'deactivate',
+        ]);
       });
       it('The return value should be an instance of promise', () => {
         expect(ret).to.eql({});