[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: tests: Avoid deprecated QUnit.push()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365038 )
Change subject: tests: Avoid deprecated QUnit.push()
..
tests: Avoid deprecated QUnit.push()
Bug: T170585
Change-Id: I1605f0f3035cc5861fd9d1ea52f00fbd32f00d58
---
M tests/ve.qunit.js
1 file changed, 60 insertions(+), 18 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/ve.qunit.js b/tests/ve.qunit.js
index 4bb3f0e..12697b3 100644
--- a/tests/ve.qunit.js
+++ b/tests/ve.qunit.js
@@ -142,9 +142,12 @@
}
actualSummary = getNodeTreeSummary( actual, shallow );
expectedSummary = getNodeTreeSummary( expected, shallow );
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummary, expectedSummary, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message
+ } );
};
/**
@@ -161,15 +164,21 @@
for ( i = 0; i < actual.length; i++ ) {
if ( expected[ i ] && expected[ i ].node !== actual[ i
].node ) {
- QUnit.push( false, actualSummary,
expectedSummary,
- message + ' (reference equality for
selection[' + i + '].node)'
- );
+ this.pushResult( {
+ result: false,
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message + ' (reference
equality for selection[' + i + '].node)'
+ } );
return;
}
}
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummary, expectedSummary, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message
+ } );
};
/**
@@ -185,9 +194,12 @@
actualSummaryHtml = ve.getDomElementSummary( actual,
true ),
expectedSummaryHtml = ve.getDomElementSummary(
expected, true );
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummaryHtml, expectedSummaryHtml, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummaryHtml,
+ expected: expectedSummaryHtml,
+ message: message
+ } );
};
QUnit.assert.equalLinearData = function ( actual, expected, message ) {
@@ -205,7 +217,12 @@
actual = ve.copy( actual, null, removeOriginalDomElements );
expected = ve.copy( expected, null, removeOriginalDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+ } );
};
QUnit.assert.equalLinearDataWithDom = function ( store, actual,
expected, message ) {
@@ -221,7 +238,12 @@
actual = ve.copy( actual, ve.convertDomElements,
addOriginalDomElements );
expected = ve.copy( expected, ve.convertDomElements,
addOriginalDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+ } );
};
/**
@@ -238,7 +260,12 @@
actual = ve.copy( actual, ve.convertDomElements );
expected = ve.copy( expected, ve.convertDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: tests: Avoid deprecated QUnit.push()
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365038 )
Change subject: tests: Avoid deprecated QUnit.push()
..
tests: Avoid deprecated QUnit.push()
Change-Id: I1605f0f3035cc5861fd9d1ea52f00fbd32f00d58
---
M tests/ve.qunit.js
1 file changed, 60 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/38/365038/1
diff --git a/tests/ve.qunit.js b/tests/ve.qunit.js
index 4bb3f0e..12697b3 100644
--- a/tests/ve.qunit.js
+++ b/tests/ve.qunit.js
@@ -142,9 +142,12 @@
}
actualSummary = getNodeTreeSummary( actual, shallow );
expectedSummary = getNodeTreeSummary( expected, shallow );
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummary, expectedSummary, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message
+ } );
};
/**
@@ -161,15 +164,21 @@
for ( i = 0; i < actual.length; i++ ) {
if ( expected[ i ] && expected[ i ].node !== actual[ i
].node ) {
- QUnit.push( false, actualSummary,
expectedSummary,
- message + ' (reference equality for
selection[' + i + '].node)'
- );
+ this.pushResult( {
+ result: false,
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message + ' (reference
equality for selection[' + i + '].node)'
+ } );
return;
}
}
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummary, expectedSummary, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummary,
+ expected: expectedSummary,
+ message: message
+ } );
};
/**
@@ -185,9 +194,12 @@
actualSummaryHtml = ve.getDomElementSummary( actual,
true ),
expectedSummaryHtml = ve.getDomElementSummary(
expected, true );
- QUnit.push(
- QUnit.equiv( actualSummary, expectedSummary ),
actualSummaryHtml, expectedSummaryHtml, message
- );
+ this.pushResult( {
+ result: QUnit.equiv( actualSummary, expectedSummary ),
+ actual: actualSummaryHtml,
+ expected: expectedSummaryHtml,
+ message: message
+ } );
};
QUnit.assert.equalLinearData = function ( actual, expected, message ) {
@@ -205,7 +217,12 @@
actual = ve.copy( actual, null, removeOriginalDomElements );
expected = ve.copy( expected, null, removeOriginalDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+ } );
};
QUnit.assert.equalLinearDataWithDom = function ( store, actual,
expected, message ) {
@@ -221,7 +238,12 @@
actual = ve.copy( actual, ve.convertDomElements,
addOriginalDomElements );
expected = ve.copy( expected, ve.convertDomElements,
addOriginalDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+ } );
};
/**
@@ -238,7 +260,12 @@
actual = ve.copy( actual, ve.convertDomElements );
expected = ve.copy( expected, ve.convertDomElements );
- QUnit.push( QUnit.equiv( actual, expected ), actual, expected,
message );
+ this.pushResult( {
+ result: QUnit.equiv( actual, expected ),
+ actual: actual,
+ expected: expected,
+ message: message
+
