Fix some problems with merge.
This commit is contained in:
@@ -59,7 +59,7 @@ jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
|
||||
|
||||
jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
|
||||
var results = suite.getResults();
|
||||
var status = results.passed() ? 'passed' : 'failed';
|
||||
var status = results.passed ? 'passed' : 'failed';
|
||||
if (results.totalCount == 0) { // todo: change this to check results.skipped
|
||||
status = 'skipped';
|
||||
}
|
||||
@@ -68,7 +68,7 @@ jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
|
||||
|
||||
jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
|
||||
var results = spec.getResults();
|
||||
var status = results.passed() ? 'passed' : 'failed';
|
||||
var status = results.passed ? 'passed' : 'failed';
|
||||
if (results.skipped) {
|
||||
status = 'skipped';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user