Comparing version 2.5.1 to 2.5.2
@@ -5,3 +5,3 @@ var path = require('path'), | ||
exit = require('./exit'), | ||
ExitCodeReporter = require('./reporters/exit_code_reporter'), | ||
CompletionReporter = require('./reporters/completion_reporter'), | ||
ConsoleSpecFilter = require('./filters/console_spec_filter'); | ||
@@ -23,7 +23,14 @@ | ||
this.reportersCount = 0; | ||
this.exitCodeReporter = new ExitCodeReporter(); | ||
this.completionReporter = new CompletionReporter(); | ||
this.onCompleteCallbackAdded = false; | ||
this.exit = exit; | ||
this.showingColors = true; | ||
this.reporter = new module.exports.ConsoleReporter(); | ||
this.env.addReporter(this.reporter); | ||
var jasmineRunner = this; | ||
this.completionReporter.onComplete(function(passed) { | ||
jasmineRunner.exitCodeCompletion(passed); | ||
}); | ||
this.coreVersion = function() { | ||
@@ -70,5 +77,3 @@ return jasmineCore.version(); | ||
} | ||
var consoleReporter = new module.exports.ConsoleReporter(options); | ||
this.provideFallbackReporter(consoleReporter); | ||
this.defaultReporterAdded = this.reportersCount === 0; | ||
this.reporter.setOptions(options); | ||
}; | ||
@@ -139,4 +144,3 @@ | ||
Jasmine.prototype.onComplete = function(onCompleteCallback) { | ||
this.exitCodeReporter.onComplete(onCompleteCallback); | ||
this.onCompleteCallbackAdded = true; | ||
this.completionReporter.onComplete(onCompleteCallback); | ||
}; | ||
@@ -148,2 +152,11 @@ | ||
Jasmine.prototype.exitCodeCompletion = function(passed) { | ||
if(passed) { | ||
this.exit(0, process.platform, process.version, process.exit, require('exit')); | ||
} | ||
else { | ||
this.exit(1, process.platform, process.version, process.exit, require('exit')); | ||
} | ||
}; | ||
Jasmine.prototype.execute = function(files, filterString) { | ||
@@ -170,16 +183,4 @@ this.loadHelpers(); | ||
if(!this.onCompleteCallbackAdded && this.defaultReporterAdded) { | ||
var jasmineRunner = this; | ||
this.exitCodeReporter.onComplete(function(passed) { | ||
if(passed) { | ||
jasmineRunner.exit(0, process.platform, process.version, process.exit, require('exit')); | ||
} | ||
else { | ||
jasmineRunner.exit(1, process.platform, process.version, process.exit, require('exit')); | ||
} | ||
}); | ||
} | ||
this.addReporter(this.exitCodeReporter); | ||
this.addReporter(this.completionReporter); | ||
this.env.execute(); | ||
}; |
@@ -8,8 +8,8 @@ module.exports = exports = ConsoleReporter; | ||
function ConsoleReporter(options) { | ||
var print = options.print, | ||
showColors = options.showColors || false, | ||
timer = options.timer || noopTimer, | ||
jasmineCorePath = options.jasmineCorePath, | ||
printDeprecation = options.printDeprecation || require('../printDeprecation'), | ||
function ConsoleReporter() { | ||
var print = function() {}, | ||
showColors = false, | ||
timer = noopTimer, | ||
jasmineCorePath = null, | ||
printDeprecation = function() {}, | ||
specCount, | ||
@@ -27,8 +27,18 @@ executableSpecCount, | ||
failedSuites = [], | ||
stackFilter = defaultStackFilter, | ||
onComplete = function() {}; | ||
this.setOptions = function(options) { | ||
print = options.print; | ||
showColors = options.showColors || false; | ||
timer = options.timer || noopTimer; | ||
jasmineCorePath = options.jasmineCorePath; | ||
printDeprecation = options.printDeprecation || require('../printDeprecation'); | ||
stackFilter = options.stackFilter || defaultStackFilter; | ||
if(options.onComplete) { | ||
printDeprecation('Passing in an onComplete function to the ConsoleReporter is deprecated.'); | ||
} | ||
var onComplete = options.onComplete || function() {}; | ||
if(options.onComplete) { | ||
printDeprecation('Passing in an onComplete function to the ConsoleReporter is deprecated.'); | ||
} | ||
onComplete = options.onComplete || function() {}; | ||
}; | ||
@@ -35,0 +45,0 @@ this.jasmineStarted = function() { |
@@ -12,3 +12,3 @@ { | ||
"license": "MIT", | ||
"version": "2.5.1", | ||
"version": "2.5.2", | ||
"repository": { | ||
@@ -24,3 +24,3 @@ "type": "git", | ||
"glob": "^7.0.6", | ||
"jasmine-core": "~2.5.1" | ||
"jasmine-core": "~2.5.2" | ||
}, | ||
@@ -27,0 +27,0 @@ "bin": "./bin/jasmine.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
23493
647
Updatedjasmine-core@~2.5.2