feat: add method 'shouldSkip(browserId)' to suite instance

gemini-testing · Jun 30, 2017 · bad551c · bad551c
1 parent 7608170
commit bad551c
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 68 deletions.
diff --git a/lib/runner/suite-runner/index.js b/lib/runner/suite-runner/index.js
@@ -3,12 +3,11 @@
 const InsistentSuiteRunner = require('./insistent-suite-runner');
 const SkippedSuiteRunner = require('./skipped-suite-runner');
 const StatelessSuiteRunner = require('./stateless-suite-runner');
-const suiteUtil = require('../../suite-util');
 
 exports.create = function(suite, browserAgent, config) {
     if (!suite.hasStates) {
         return new StatelessSuiteRunner(suite, browserAgent);
-    } else if (suiteUtil.shouldSkip(suite, browserAgent.browserId)) {
+    } else if (suite.shouldSkip(browserAgent.browserId)) {
         return new SkippedSuiteRunner(suite, browserAgent);
     } else {
         return new InsistentSuiteRunner(suite, browserAgent, config);

diff --git a/lib/state.js b/lib/state.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const _ = require('lodash');
-const suiteUtil = require('./suite-util');
 
 module.exports = class State {
     constructor(suite, name) {
@@ -22,7 +21,7 @@ module.exports = class State {
     }
 
     shouldSkip(browserId) {
-        return suiteUtil.shouldSkip(this.suite, browserId);
+        return this.suite.shouldSkip(browserId);
     }
 
     get fullName() {

diff --git a/lib/suite-util.js b/lib/suite-util.js
diff --git a/lib/suite.js b/lib/suite.js
@@ -65,6 +65,21 @@ module.exports = class Suite {
         }
     }
 
+    shouldSkip(browserId) {
+        if (_.isBoolean(this.skipped)) {
+            return this.skipped;
+        }
+
+        return this.skipped.some((browserSkipMatcher) => {
+            if (browserSkipMatcher.matches(browserId)) {
+                this.skipComment = browserSkipMatcher.comment;
+                return true;
+            }
+
+            return false;
+        });
+    }
+
     clone() {
         const clonedSuite = Suite.create(this.name, this.parent);
 

diff --git a/test/unit/runner/suite-runner/index.js b/test/unit/runner/suite-runner/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const proxyquire = require('proxyquire');
-const suiteUtil = require('lib/suite-util');
 const util = require('../../../util');
 
 describe('runner/suite-runner/create', () => {
@@ -51,20 +50,23 @@ describe('runner/suite-runner/create', () => {
     });
 
     describe('SkippedSuiteRunner', () => {
+        let suite;
+
         beforeEach(() => {
-            sandbox.stub(suiteUtil, 'shouldSkip').returns(true);
+            suite = makeSuite();
+            suite.shouldSkip = sinon.stub().returns(true);
         });
 
         it('should create SkippedSuiteRunner', () => {
-            makeSuiteRunner(makeSuite());
+            makeSuiteRunner(suite);
 
             assert.calledOnce(SkippedRunner);
             assert.notCalled(StatelessRunner);
             assert.notCalled(InsistentRunner);
         });
 
         it('should return SkippedSuiteRunner for skipped suite', () => {
-            const runner = makeSuiteRunner(makeSuite(), {});
+            const runner = makeSuiteRunner(suite, {});
 
             assert.instanceOf(runner, SkippedRunner);
         });

diff --git a/test/unit/state.js b/test/unit/state.js
@@ -2,18 +2,16 @@
 
 const State = require('lib/state');
 const util = require('../util');
-const suiteUtil = require('lib/suite-util');
 
 describe('state methods', () => {
     describe('shouldSkip', () => {
         it('should check if state will be skipped', () => {
             const suite = util.makeSuiteStub();
+            suite.shouldSkip = sinon.stub();
+            suite.shouldSkip.withArgs('browserId').returns(true);
             const state = new State(suite);
-            sinon.stub(suiteUtil, 'shouldSkip').returns(true);
 
-            state.shouldSkip('browserId');
-
-            assert.calledWithMatch(suiteUtil.shouldSkip, suite, 'browserId');
+            assert.isTrue(state.shouldSkip('browserId'));
         });
     });
 

diff --git a/test/unit/suite-util.test.js b/test/unit/suite-util.test.js
diff --git a/test/unit/suite.test.js → test/unit/suite.js b/test/unit/suite.test.js → test/unit/suite.js
@@ -226,6 +226,51 @@ describe('suite', () => {
         });
     });
 
+    describe('shouldSkip', () => {
+        let suite;
+
+        const createBrowserSkipMatcher = (browserId) => {
+            const matcher = {matches: sinon.stub()};
+            matcher.matches.withArgs(browserId).returns(true);
+
+            return matcher;
+        };
+
+        beforeEach(() => suite = createSuite('suite'));
+
+        it('should be "false" for any browser if a suite is not skipped', function() {
+            assert.isFalse(suite.shouldSkip('browser'));
+        });
+
+        it('should be "true" for any browser if a suite is skipped', () => {
+            suite.skip();
+
+            assert.isTrue(suite.shouldSkip('browser'));
+        });
+
+        it('should be "true" for a browser if a suite is skipped in it', () => {
+            suite.skip(createBrowserSkipMatcher('1st-skipped-bro'));
+            suite.skip(createBrowserSkipMatcher('2nd-skipped-bro'));
+
+            assert.isTrue(suite.shouldSkip('1st-skipped-bro'));
+            assert.isTrue(suite.shouldSkip('2nd-skipped-bro'));
+        });
+
+        it('should set a skip comment if a suite is skipped in a browser', () => {
+            suite.skip({matches: sinon.stub().withArgs('skipped-bro').returns(true), comment: 'skip-comment'});
+
+            suite.shouldSkip('skipped-bro');
+            assert.equal(suite.skipComment, 'skip-comment');
+        });
+
+        it('should be "false" for a browser if a suite is not skipped in it', () => {
+            suite.skip(createBrowserSkipMatcher('1st-skipped-bro'));
+            suite.skip(createBrowserSkipMatcher('2st-skipped-bro'));
+
+            assert.isFalse(suite.shouldSkip('some-bro'));
+        });
+    });
+
     describe('hasChild', () => {
         let suite;