Merge 51828d9 into 527104b

TryGhost · May 30, 2019 · 3372034 · 3372034
2 parents 527104b + 51828d9
commit 3372034
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/system.js b/lib/system.js
@@ -196,7 +196,7 @@ class System {
      */
     hasInstance(instance) {
         const instances = this.globalConfig.get('instances', {});
-        return some(instances, ({cwd}) => cwd === instance.dir);
+        return some(instances, ({cwd}, name) => cwd === instance.dir && name === instance.name);
     }
 
     /**

diff --git a/test/unit/system-spec.js b/test/unit/system-spec.js
@@ -289,12 +289,17 @@ describe('Unit: System', function () {
     it('hasInstance works', function () {
         const System = require(modulePath);
         const system = new System({}, []);
-        system.globalConfig.set('instances', {test: {cwd: '/dir/a'}});
+        system.globalConfig.set('instances', {test: {cwd: '/dir/a'}, test2: {cwd: '/dir/c'}});
         const instanceA = new Instance({}, system, '/dir/a');
+        instanceA._cliConfig.set('name', 'test');
+
         const instanceB = new Instance({}, system, '/dir/b');
+        const instanceC = new Instance({}, system, '/dir/c');
+        instanceC._cliConfig.set('name', 'different');
 
         expect(system.hasInstance(instanceA)).to.be.true;
         expect(system.hasInstance(instanceB)).to.be.false;
+        expect(system.hasInstance(instanceC)).to.be.false;
     });
 
     it('cachedInstance loads instance and caches it', function () {