Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195575
Change subject: [BREAKING CHANGE] ve.utils: Remove ve.getObjectKeys in favour
of Object.keys
......................................................................
[BREAKING CHANGE] ve.utils: Remove ve.getObjectKeys in favour of Object.keys
Callers were already removed last year, but a few came back in
test files. Let's remove it properly this time.
Change-Id: I687293d4ca6300519752aa1b9e77110e6353d49f
---
M src/ve.utils.js
M tests/dm/ve.dm.Converter.test.js
M tests/dm/ve.dm.Transaction.test.js
M tests/ve.test.js
4 files changed, 15 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/75/195575/1
diff --git a/src/ve.utils.js b/src/ve.utils.js
index ff42561..5ffe7fd 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -52,13 +52,6 @@
/**
* @method
- * @until ES5: Object#keys
- * @inheritdoc Object#keys
- */
-ve.getObjectKeys = Object.keys;
-
-/**
- * @method
* @inheritdoc OO#compare
*/
ve.compare = OO.compare;
diff --git a/tests/dm/ve.dm.Converter.test.js b/tests/dm/ve.dm.Converter.test.js
index 3b10383..d9fb938 100644
--- a/tests/dm/ve.dm.Converter.test.js
+++ b/tests/dm/ve.dm.Converter.test.js
@@ -21,7 +21,7 @@
QUnit.test( 'getDomFromModel', function ( assert ) {
var msg, cases = ve.dm.example.domToDataCases;
- QUnit.expect( 3 * ve.getObjectKeys( cases ).length );
+ QUnit.expect( 3 * Object.keys( cases ).length );
for ( msg in cases ) {
ve.test.utils.runGetDomFromModelTest( assert, ve.copy(
cases[msg] ), msg );
diff --git a/tests/dm/ve.dm.Transaction.test.js
b/tests/dm/ve.dm.Transaction.test.js
index 55cbb20..e60e448 100644
--- a/tests/dm/ve.dm.Transaction.test.js
+++ b/tests/dm/ve.dm.Transaction.test.js
@@ -406,7 +406,7 @@
// TODO test cases for (currently failing) unopened
closings use case
// TODO analyze other possible cases (substrings of
linmod data)
};
- QUnit.expect( ve.getObjectKeys( cases ).length * 2 );
+ QUnit.expect( Object.keys( cases ).length * 2 );
for ( key in cases ) {
for ( i = 0; i < cases[key].ops.length; i++ ) {
if ( cases[key].ops[i].remove ) {
@@ -732,7 +732,7 @@
]
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
for ( key in cases ) {
for ( i = 0; i < cases[key].ops.length; i++ ) {
store = cases[key].args[0].getStore();
@@ -793,7 +793,7 @@
]
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
for ( key in cases ) {
for ( i = 0; i < cases[key].ops.length; i++ ) {
if ( cases[key].ops[i].remove ) {
@@ -1120,7 +1120,7 @@
exception: Error
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
runConstructorTests( assert, ve.dm.Transaction.newFromAttributeChanges,
cases );
} );
@@ -1395,7 +1395,7 @@
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
runConstructorTests( assert, ve.dm.Transaction.newFromAnnotation, cases
);
} );
@@ -1566,7 +1566,7 @@
]
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
for ( key in cases ) {
for ( i = 0; i < cases[key].ops.length; i++ ) {
store = cases[key].args[0].getStore();
@@ -1748,7 +1748,7 @@
exception: Error
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
for ( key in cases ) {
for ( i = 0; cases[key].ops && i < cases[key].ops.length; i++ )
{
if ( cases[key].ops[i].remove ) {
@@ -1800,7 +1800,7 @@
15: [18, 21],
16: 22
};
- QUnit.expect( 2 * ve.getObjectKeys( mapping ).length );
+ QUnit.expect( 2 * Object.keys( mapping ).length );
for ( offset in mapping ) {
expected = Array.isArray( mapping[offset] ) ? mapping[offset] :
[ mapping[offset], mapping[offset] ];
assert.strictEqual( tx.translateOffset( Number( offset ) ),
expected[1], offset );
@@ -2076,7 +2076,7 @@
diff: 0
}
};
- QUnit.expect( 2 * ve.getObjectKeys( cases ).length );
+ QUnit.expect( 2 * Object.keys( cases ).length );
runBuilderTests( assert, cases );
} );
@@ -2118,7 +2118,7 @@
diff: 0
}
};
- QUnit.expect( 2 * ve.getObjectKeys( cases ).length );
+ QUnit.expect( 2 * Object.keys( cases ).length );
runBuilderTests( assert, cases );
} );
@@ -2195,7 +2195,7 @@
diff: 0
}
};
- QUnit.expect( 2 * ve.getObjectKeys( cases ).length );
+ QUnit.expect( 2 * Object.keys( cases ).length );
runBuilderTests( assert, cases );
} );
@@ -2261,7 +2261,7 @@
]
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
runConstructorTests( assert,
ve.dm.Transaction.newFromMetadataInsertion, cases );
} );
@@ -2324,7 +2324,7 @@
exception: Error
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
runConstructorTests( assert, ve.dm.Transaction.newFromMetadataRemoval,
cases );
} );
@@ -2373,7 +2373,7 @@
exception: Error
}
};
- QUnit.expect( ve.getObjectKeys( cases ).length );
+ QUnit.expect( Object.keys( cases ).length );
runConstructorTests( assert,
ve.dm.Transaction.newFromMetadataElementReplacement, cases );
} );
diff --git a/tests/ve.test.js b/tests/ve.test.js
index 914fb0f..e01bb8e 100644
--- a/tests/ve.test.js
+++ b/tests/ve.test.js
@@ -16,8 +16,6 @@
// ve.getObjectValues: Tested upstream (OOjs)
-// ve.getObjectKeys: Tested upstream (JavaScript)
-
// ve.compare: Tested upstream (OOjs)
// ve.copy: Tested upstream (OOjs)
--
To view, visit https://gerrit.wikimedia.org/r/195575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I687293d4ca6300519752aa1b9e77110e6353d49f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
