fix: enable correct suite through suite collection api

sipayRT · sipayRT · commit 60c1147320fb · 2017-03-27T15:35:56.000+03:00
If there are 2 suites with equal names suiteCollection.enable will enable first suite
diff --git a/lib/suite-collection.js b/lib/suite-collection.js
@@ -106,13 +106,14 @@ module.exports = class SuiteCollection {
     }
 
     _disableEntity(obj, browser) {
-        this._originalBrowsers[obj.fullName] = obj.browsers;
+        this._originalBrowsers[obj.fullName + obj.file] = obj.browsers;
         obj.browsers = browser ? _.without(obj.browsers, browser) : [];
     }
 
     _enableEntity(obj, browser) {
-        if (!browser && this._originalBrowsers[obj.fullName]) {
-            obj.browsers = _.union(obj.browsers, this._originalBrowsers[obj.fullName]);
+        const suiteKey = obj.fullName + obj.file;
+        if (!browser && this._originalBrowsers[suiteKey]) {
+            obj.browsers = _.union(obj.browsers, this._originalBrowsers[suiteKey]);
         }
 
         if (browser) {
diff --git a/test/unit/suite-collection.js b/test/unit/suite-collection.js
@@ -2,6 +2,7 @@
 
 const proxyquire = require('proxyquire');
 const mkTree = require('../util').makeSuiteTree;
+const mkSuite = require('../util').makeSuiteStub;
 
 describe('suite-collection', () => {
     const sandbox = sinon.sandbox.create();
@@ -385,6 +386,26 @@ describe('suite-collection', () => {
                 assert.deepEqual(tree.child.browsers, ['b1', 'b2']);
             });
 
+            it('should enable only current suite if there are the same suites exists in the tree', () => {
+                const suite1 = mkSuite({
+                    name: 'suite',
+                    browsers: ['b1', 'b2'],
+                    file: 'some/path.js'
+                });
+                const suite2 = mkSuite({
+                    name: 'suite',
+                    browsers: ['b3', 'b4'],
+                    file: 'another/path.js'
+                });
+
+                new SuiteCollection([suite1, suite2])
+                    .disableAll()
+                    .enable(suite1);
+
+                assert.deepEqual(suite1.browsers, ['b1', 'b2']);
+                assert.deepEqual(suite2.browsers, []);
+            });
+
             it('should fail on attempt to enable unknown suite', () => {
                 const tree = mkTree({
                     suite: []
diff --git a/test/util.js b/test/util.js
@@ -47,6 +47,7 @@ function makeSuiteStub(opts) {
         suite.addState(state);
     });
     suite.url = opts.url;
+    suite.file = opts.file;
 
     return suite;
 }

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,14 @@ module.exports = class SuiteCollection {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`_disableEntity(obj, browser) {`
`109`		`- this._originalBrowsers[obj.fullName] = obj.browsers;`
	`109`	`+ this._originalBrowsers[obj.fullName + obj.file] = obj.browsers;`
`110`	`110`	`obj.browsers = browser ? _.without(obj.browsers, browser) : [];`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`_enableEntity(obj, browser) {`
`114`		`- if (!browser && this._originalBrowsers[obj.fullName]) {`
`115`		`- obj.browsers = _.union(obj.browsers, this._originalBrowsers[obj.fullName]);`
	`114`	`+ const suiteKey = obj.fullName + obj.file;`
	`115`	`+ if (!browser && this._originalBrowsers[suiteKey]) {`
	`116`	`+ obj.browsers = _.union(obj.browsers, this._originalBrowsers[suiteKey]);`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`if (browser) {`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ function makeSuiteStub(opts) {`
`47`	`47`	`suite.addState(state);`
`48`	`48`	`});`
`49`	`49`	`suite.url = opts.url;`
	`50`	`+ suite.file = opts.file;`
`50`	`51`
`51`	`52`	`return suite;`
`52`	`53`	`}`