web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-11-27 14:44:57 +01:00
parent 644f6e9985 5eacc158d9
commit 68d602f74a
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
www/assert/main.js
View File

@@ -1,16 +1,14 @@
define([ define([
'jquery', 'jquery',
'/bower_components/hyperjson/hyperjson.js', '/bower_components/hyperjson/hyperjson.js',
'/bower_components/textpatcher/TextPatcher.amd.js',
'json.sortify', 'json.sortify',
'/drive/tests.js', '/drive/tests.js',
'/common/test.js', '/common/test.js',
'/common/common-hash.js', '/common/common-hash.js',
'/common/common-thumbnail.js', '/common/common-thumbnail.js',
'/common/flat-dom.js', '/common/flat-dom.js',
], function ($, Hyperjson, TextPatcher, Sortify, Drive, Test, Hash, Thumb, Flat) { ], function ($, Hyperjson, Sortify, Drive, Test, Hash, Thumb, Flat) {
window.Hyperjson = Hyperjson; window.Hyperjson = Hyperjson;
window.TextPatcher = TextPatcher;
window.Sortify = Sortify; window.Sortify = Sortify;
var assertions = 0; var assertions = 0;
@@ -94,18 +92,7 @@ define([
// turn it back into stringified Hyperjson, but apply filters // turn it back into stringified Hyperjson, but apply filters
var shjson2 = Sortify(Hyperjson.fromDOM(DOM, elementFilter, attributeFilter)); var shjson2 = Sortify(Hyperjson.fromDOM(DOM, elementFilter, attributeFilter));
var success = shjson === shjson2; return cb(shjson === shjson2);
var op = TextPatcher.diff(shjson, shjson2);
var diff = TextPatcher.format(shjson, op);
if (success) {
return cb(true);
} else {
return cb('<br><br>insert: ' + diff.insert + '<br><br>' +
'remove: ' + diff.remove + '<br><br>');
}
}, "expected hyperjson equality"); }, "expected hyperjson equality");
}; };
@@ -116,21 +103,8 @@ define([
assert(function (cb) { assert(function (cb) {
var hjson = Hyperjson.fromDOM(target); var hjson = Hyperjson.fromDOM(target);
var cloned = Hyperjson.toDOM(hjson); var cloned = Hyperjson.toDOM(hjson);
var success = cloned.outerHTML === target.outerHTML;
if (!success) { return cb(cloned.outerHTML === target.outerHTML);
var op = TextPatcher.diff(target.outerHTML, cloned.outerHTML);
window.DEBUG = {
error: "Expected equality between A and B",
A: target.outerHTML,
B: cloned.outerHTML,
diff: op
};
console.log("DIFF:");
TextPatcher.log(target.outerHTML, op);
}
return cb(success);
}, "Round trip serialization introduced artifacts."); }, "Round trip serialization introduced artifacts.");
}; };