feat: remove deprecated END_TEST event

j0tunn · j0tunn · commit 9c7c8e252485 · 2017-11-02T17:44:45.000+03:00
diff --git a/lib/constants/events.js b/lib/constants/events.js
@@ -28,7 +28,6 @@ module.exports = {
     WARNING: 'warning',
     ERROR: 'err', // unable to call it `error` because `error` handling is a special case for EventEmitter
 
-    END_TEST: 'endTest', // Deprecated, will be removed in the next major version - 5.0.0
     CAPTURE: 'capture', // Deprecated, will be removed in the next major version - 5.0.0
 
     TEST_RESULT: 'testResult',
diff --git a/lib/runner/index.js b/lib/runner/index.js
@@ -93,17 +93,16 @@ module.exports = class TestsRunner extends Runner {
         runner.on(Events.END_SUITE, (data) => this._suiteMonitor.suiteFinished(data.suite, data.browserId));
 
         runner.on(Events.CAPTURE, (result) => this._handleResult(result, Events.CAPTURE));
-        runner.on(Events.TEST_RESULT, (result) => this._handleResult(result, [Events.END_TEST, Events.TEST_RESULT]));
+        runner.on(Events.TEST_RESULT, (result) => this._handleResult(result, Events.TEST_RESULT));
         runner.on(Events.UPDATE_RESULT, (result) => this._handleResult(result, Events.UPDATE_RESULT));
 
         this._browserRunners.push(runner);
         return runner.run(suiteCollection, this._stateProcessor);
     }
 
-    _handleResult(result, events) {
+    _handleResult(result, event) {
         this._saveCoverage(result);
-
-        [].concat(events).forEach((event) => this.emit(event, result));
+        this.emit(event, result);
     }
 
     _saveCoverage(data) {
diff --git a/test/unit/gemini.js b/test/unit/gemini.js
@@ -98,7 +98,6 @@ describe('gemini', () => {
         Events.WARNING,
         Events.ERROR,
 
-        Events.END_TEST,
         Events.CAPTURE,
 
         Events.TEST_RESULT,
diff --git a/test/unit/runner/index.js b/test/unit/runner/index.js
@@ -503,6 +503,7 @@ describe('runner', () => {
 
             [
                 Events.CAPTURE,
+                Events.TEST_RESULT,
                 Events.UPDATE_RESULT
             ].forEach((event) => {
                 describe(`on ${event}`, () => {
@@ -511,40 +512,6 @@ describe('runner', () => {
                     testCoverage(event);
                 });
             });
-
-            describe('on testResult', () => {
-                testPassthrough(Events.TEST_RESULT, 'should passthrough "testResult" event');
-
-                it('should passthrough "endTest" event', () => {
-                    stubBrowserRunner((runner) => runner.emit(Events.TEST_RESULT, {foo: 'bar'}));
-
-                    const runner = createRunner();
-                    const onEndTest = sinon.spy().named('onEndTest');
-
-                    runner.on(Events.END_TEST, onEndTest);
-
-                    return run(runner)
-                        .then(() => {
-                            assert.calledOnce(onEndTest);
-                            assert.calledWith(onEndTest, {foo: 'bar'});
-                        });
-                });
-
-                it('should emit "testResult" event after "endTest" one', () => {
-                    stubBrowserRunner((runner) => runner.emit(Events.TEST_RESULT));
-
-                    const runner = createRunner();
-                    const onEndTest = sinon.spy().named('onEndTest');
-                    const onTestResult = sinon.spy().named('onTestResult');
-
-                    runner.on(Events.END_TEST, onEndTest);
-                    runner.on(Events.TEST_RESULT, onTestResult);
-
-                    return run(runner).then(() => assert.callOrder(onEndTest, onTestResult));
-                });
-
-                testCoverage(Events.TEST_RESULT);
-            });
         });
     });
 
