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

Use Jasmine's arrayContains, instead of includes for better support

Browse Source
This commit is contained in:
Gregg Van Hove
2018-02-26 17:57:37 -08:00
parent fdecf02472
commit 63cc7cafc8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jasmine-core/jasmine.js
View File

@@ -2513,7 +2513,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
function filterJasmine(stackTrace) { function filterJasmine(stackTrace) {
var result = [], var result = [],
jasmineMarker = stackTrace.style === 'webkit' ? '<Jasmine>' : ' at <Jasmine>'; jasmineMarker = stackTrace.style === 'webkit' ? '<Jasmine>' : ' at <Jasmine>';
stackTrace.frames.forEach(function(frame) { stackTrace.frames.forEach(function(frame) {
if (frame.file && frame.file !== jasmineFile) { if (frame.file && frame.file !== jasmineFile) {
result.push(frame.raw); result.push(frame.raw);
@@ -2521,7 +2521,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
result.push(jasmineMarker); result.push(jasmineMarker);
} }
}); });
return result; return result;
} }
@@ -2535,7 +2535,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
var empty = true; var empty = true;
for (var prop in error) { for (var prop in error) {
if (ignored.includes(prop)) { if (j$.util.arrayContains(ignored, prop)) {
continue; continue;
} }
result[prop] = error[prop]; result[prop] = error[prop];

6
src/core/ExceptionFormatter.js
View File

@@ -44,7 +44,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
function filterJasmine(stackTrace) { function filterJasmine(stackTrace) {
var result = [], var result = [],
jasmineMarker = stackTrace.style === 'webkit' ? '<Jasmine>' : ' at <Jasmine>'; jasmineMarker = stackTrace.style === 'webkit' ? '<Jasmine>' : ' at <Jasmine>';
stackTrace.frames.forEach(function(frame) { stackTrace.frames.forEach(function(frame) {
if (frame.file && frame.file !== jasmineFile) { if (frame.file && frame.file !== jasmineFile) {
result.push(frame.raw); result.push(frame.raw);
@@ -52,7 +52,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
result.push(jasmineMarker); result.push(jasmineMarker);
} }
}); });
return result; return result;
} }
@@ -66,7 +66,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) {
var empty = true; var empty = true;
for (var prop in error) { for (var prop in error) {
if (ignored.includes(prop)) { if (j$.util.arrayContains(ignored, prop)) {
continue; continue;
} }
result[prop] = error[prop]; result[prop] = error[prop];