moved exit listener add and removal to completion reporter

jasmine · Jan 23, 2019 · 8e9ab27 · 8e9ab27
1 parent b8183d2
commit 8e9ab27
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/lib/jasmine.js b/lib/jasmine.js
@@ -233,7 +233,7 @@ var checkExit = function(jasmineRunner) {
 };
 
 Jasmine.prototype.execute = function(files, filterString) {
-  process.on('exit', this.checkExit);
+  this.completionReporter.exitHandler = this.checkExit;
 
   this.loadRequires();
   this.loadHelpers();

diff --git a/lib/reporters/completion_reporter.js b/lib/reporters/completion_reporter.js
@@ -6,12 +6,24 @@ module.exports = function() {
     onCompleteCallback = callback;
   };
 
+  this.jasmineStarted = function() {
+    if (this.exitHandler) {
+      process.on('exit', this.exitHandler);
+    }
+  };
+
   this.jasmineDone = function(result) {
     completed = true;
+    if (this.exitHandler) {
+      process.off('exit', this.exitHandler);
+    }
+
     onCompleteCallback(result.overallStatus === 'passed');
   };
 
   this.isComplete = function() {
     return completed;
   };
+
+  this.exitHandler = null;
 };
diff --git a/spec/jasmine_spec.js b/spec/jasmine_spec.js
@@ -26,12 +26,6 @@ describe('Jasmine', function() {
     this.testJasmine = new Jasmine({ jasmineCore: this.fakeJasmineCore });
   });
 
-  afterEach(function() {
-    if (this.testJasmine.checkExit) {
-      process.removeListener('exit', this.testJasmine.checkExit);
-    }
-  });
-
   describe('constructor options', function() {
     it('have defaults', function() {
       expect(this.testJasmine.projectBaseDir).toEqual(path.resolve());
@@ -410,6 +404,7 @@ describe('Jasmine', function() {
       this.testJasmine.execute();
 
       expect(this.testJasmine.addReporter).toHaveBeenCalledWith(completionReporterSpy);
+      expect(this.testJasmine.completionReporter.exitHandler).toBe(this.testJasmine.checkExit);
     });
 
     describe('when exit is called prematurely', function() {

diff --git a/spec/reporters/completion_reporter_spec.js b/spec/reporters/completion_reporter_spec.js
@@ -5,6 +5,8 @@ describe('CompletionReporter', function() {
     this.reporter = new CompletionReporter();
     this.onComplete = jasmine.createSpy('onComplete');
     this.reporter.onComplete(this.onComplete);
+    this.processOn = spyOn(process, 'on').and.callThrough();
+    this.processOff = spyOn(process, 'off').and.callThrough();
   });
 
   describe('When the overall status is "passed"', function() {
@@ -20,4 +22,21 @@ describe('CompletionReporter', function() {
       expect(this.onComplete).toHaveBeenCalledWith(false);
     });
   });
+
+  describe('When jasmine is started and done', function() {
+    it('adds and removes the exit handler', function() {
+      this.reporter.exitHandler = function() {};
+      this.reporter.jasmineStarted();
+      this.reporter.jasmineDone({overallStatus: 'passed'});
+      expect(this.processOn).toHaveBeenCalledWith('exit', this.reporter.exitHandler);
+      expect(this.processOff).toHaveBeenCalledWith('exit', this.reporter.exitHandler);
+    });
+
+    it('ignores the exit event if there is no exit handler', function() {
+      this.reporter.jasmineStarted();
+      this.reporter.jasmineDone({overallStatus: 'passed'});
+      expect(this.processOn).toHaveBeenCalledTimes(0);
+      expect(this.processOff).toHaveBeenCalledTimes(0);
+    });
+  });
 });