admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into expect-context

Browse Source
This commit is contained in:
Gregg Van Hove
2018-10-22 14:55:20 -07:00
parent ac07c9ea97 e6a60a7bef
commit 1d130036f4
44 changed files with 2576 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/Expectation.js
View File

@@ -39,7 +39,7 @@ getJasmineRequireObj().Expectation = function(j$) {
Expectation.prototype.processResult = function(result, name, expected, args) {
var message = this.buildMessage(result, name, args);
if (expected.length == 1) {
if (expected.length === 1) {
expected = expected[0];
}
@@ -58,14 +58,13 @@ getJasmineRequireObj().Expectation = function(j$) {
};
Expectation.prototype.buildMessage = function(result, name, args) {
var util = this.util,
msg;
var util = this.util;
if (result.pass) {
return '';
}
msg = this.filters.buildFailureMessage(result, name, args, util, defaultMessage);
var msg = this.filters.buildFailureMessage(result, name, args, util, defaultMessage);
return this.filters.modifyFailureMessage(msg || defaultMessage());
function defaultMessage() {