Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/58241


Change subject: Fix for custom hash with keys in different order
......................................................................

Fix for custom hash with keys in different order

Just a breaking test for now.

Bug: 46895
Change-Id: I6a9b42facd97fbf49042d3a082121ec93659b9f1
---
M modules/ve/test/ve.test.js
1 file changed, 54 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/41/58241/1

diff --git a/modules/ve/test/ve.test.js b/modules/ve/test/ve.test.js
index 80d15a8..b93bfcb 100644
--- a/modules/ve/test/ve.test.js
+++ b/modules/ve/test/ve.test.js
@@ -132,42 +132,77 @@
 
 // ve.extendObject: Tested upstream (jQuery)
 
-QUnit.test( 'getHash: Basic usage', 5, function ( assert ) {
-       var tmp, hash, objects;
+QUnit.test( 'getHash: Basic usage', 7, function ( assert ) {
+       var tmp,
+               cases = {},
+               hash = '{"a":1,"b":1,"c":1}',
+               customHash = '{"first":1,"last":1}';
 
-       objects = {};
-
-       objects['a-z literal'] = {
-               a: 1,
-               b: 1,
-               c: 1
+       cases['a-z literal'] = {
+               object: {
+                       a: 1,
+                       b: 1,
+                       c: 1
+               },
+               hash: hash
        };
 
-       objects['z-a literal'] = {
-               c: 1,
-               b: 1,
-               a: 1
+       cases['z-a literal'] = {
+               object: {
+                       c: 1,
+                       b: 1,
+                       a: 1
+               },
+               hash: hash
        };
 
        tmp = {};
-       objects['a-z augmented'] = tmp;
+       cases['a-z augmented'] = {
+               object: tmp,
+               hash: hash
+       };
        tmp.a = 1;
        tmp.b = 1;
        tmp.c = 1;
 
        tmp = {};
-       objects['z-a augmented'] = tmp;
+       cases['z-a augmented'] = {
+               object: tmp,
+               hash: hash
+       };
        tmp.c = 1;
        tmp.b = 1;
        tmp.a = 1;
 
-       hash = '{"a":1,"b":1,"c":1}';
+       cases['custom hash'] = {
+               object: {
+                       getHashObject: function () {
+                               return {
+                                       'first': 1,
+                                       'last': 1
+                               };
+                       }
+               },
+               hash: customHash
+       };
 
-       $.each( objects, function ( key, val ) {
+       cases['custom hash reversed'] = {
+               object: {
+                       getHashObject: function () {
+                               return {
+                                       'last': 1,
+                                       'first': 1
+                               };
+                       }
+               },
+               hash: customHash
+       };
+
+       $.each( cases, function ( key, val ) {
                assert.equal(
-                       ve.getHash( val ),
-                       hash,
-                       'Similar enough objects have the same hash, regardless 
of "property order"'
+                       ve.getHash( val.object ),
+                       val.hash,
+                       key + ': object has expected hash, regardless of 
"property order"'
                );
        });
 

-- 
To view, visit https://gerrit.wikimedia.org/r/58241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a9b42facd97fbf49042d3a082121ec93659b9f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to