fix: Implement advanced verification for suites with same names

tormozz48 · tormozz48 · commit 2572af523225 · 2016-11-09T13:34:08.000+03:00
It is necessary to avoid error which occurs on testing suites with same names but on different platforms
diff --git a/lib/suite.js b/lib/suite.js
@@ -80,8 +80,10 @@ module.exports = class Suite {
         return clonedSuite;
     }
 
-    hasChildNamed(name) {
-        return _.some(this._children, {name: name});
+    hasChild(name, browsers) {
+        return _.some(this.children, (child) => {
+            return _.isEqual(child.name, name) && !_.isEmpty(_.intersection(child.browsers, browsers));
+        });
     }
 
     hasStateNamed(name) {
diff --git a/lib/tests-api/index.js b/lib/tests-api/index.js
@@ -17,7 +17,7 @@ module.exports = (suite, browsers) => {
             throw new TypeError('Second argument of the gemini.suite must be a function');
         }
 
-        if (suite.hasChildNamed(name)) {
+        if (suite.hasChild(name, browsers)) {
             throw new Error(`Suite ${name} already exists at this level. Choose different name`);
         }
 
diff --git a/test/unit/suite.test.js b/test/unit/suite.test.js
@@ -226,21 +226,28 @@ describe('suite', () => {
         });
     });
 
-    describe('hasChildNamed', () => {
+    describe('hasChild', () => {
         let suite;
 
         beforeEach(() => {
             suite = createSuite('parent');
             const child = createSuite('has', suite);
+            child.browsers = ['bro1', 'bro2'];
             suite.addChild(child);
         });
 
-        it('should return true when suite has child of a given name', () => {
-            assert.isTrue(suite.hasChildNamed('has'));
+        it('should return true when suite has child with given name and intersected browser set', () => {
+            assert.isTrue(suite.hasChild('has', ['bro1']));
         });
 
-        it('should return false when suite has no child of a given name', () => {
-            assert.isFalse(suite.hasChildNamed('has no'));
+        describe('should return false when', () => {
+            it('suite has no child with given name', () => {
+                assert.isFalse(suite.hasChild('has no', []));
+            });
+
+            it('has child with given name and not intersected browser set', () => {
+                assert.isFalse(suite.hasChild('has no', ['bad-bro']));
+            });
         });
     });
 
diff --git a/test/unit/tests-api/index.js b/test/unit/tests-api/index.js
@@ -47,11 +47,31 @@ describe('tests-api', function() {
             assert.equal(this.suite.children[0].children[0].name, 'child');
         });
 
-        it('should not allow create two child suites of the same name', function() {
-            assert.throws(function() {
-                gemini.suite('name', function() {
-                    gemini.suite('child', function() {});
-                    gemini.suite('child', function() {});
+        describe('child suites of the same name', () => {
+            beforeEach(function() {
+                gemini = testsAPI(this.suite, ['browser1']);
+            });
+
+            it('should not allow to create with intersect browsers', function() {
+                assert.throws(() => {
+                    gemini.suite('name', () => {
+                        gemini.suite('child', () => {});
+                        gemini.suite('child', () => {});
+                    });
+                });
+            });
+
+            it('should allow to create with not intersecting browser sets', function() {
+                gemini.suite('name', () => {
+                    gemini.suite('child', () => {});
+                });
+
+                gemini = testsAPI(this.suite, ['browser2']);
+
+                assert.doesNotThrow(() => {
+                    gemini.suite('name', () => {
+                        gemini.suite('child', () => {});
+                    });
                 });
             });
         });

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,10 @@ module.exports = class Suite {`
`80`	`80`	`return clonedSuite;`
`81`	`81`	`}`
`82`	`82`
`83`		`- hasChildNamed(name) {`
`84`		`- return _.some(this._children, {name: name});`
	`83`	`+ hasChild(name, browsers) {`
	`84`	`+ return _.some(this.children, (child) => {`
	`85`	`+ return _.isEqual(child.name, name) && !_.isEmpty(_.intersection(child.browsers, browsers));`
	`86`	`+ });`
`85`	`87`	`}`
`86`	`88`
`87`	`89`	`hasStateNamed(name) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ module.exports = (suite, browsers) => {`
`17`	`17`	`throw new TypeError('Second argument of the gemini.suite must be a function');`
`18`	`18`	`}`
`19`	`19`
`20`		`- if (suite.hasChildNamed(name)) {`
	`20`	`+ if (suite.hasChild(name, browsers)) {`
`21`	`21`	throw new Error(`Suite ${name} already exists at this level. Choose different name`);
`22`	`22`	`}`
`23`	`23`