mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

diff.mjs: Fixes tests and adds default flag

Browse source 
* Sets default flag to `false` for `showSubtraction` flag.
    * Removes extra span for else case that was causing some tests to
    fail. Moreover, the previous behavior was defined as that.
    * Adds custom test for the showSubtraction option, both using the
    `showAdded` and `showRemoved` flags.
This commit is contained in:
Gustavo Silva 2019-10-29 23:35:35 +00:00
parent 726e117656
commit 9108b3923b
No known key found for this signature in database
GPG key ID: 08551320BC3EDC50
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/operations/Diff.mjs
View file

@ -50,7 +50,7 @@ class Diff extends Operation {
{ {
"name": "Show subtraction", "name": "Show subtraction",
"type": "boolean", "type": "boolean",
"value": true "value": false
}, },
{ {
"name": "Ignore whitespace", "name": "Ignore whitespace",
@ -123,7 +123,7 @@ class Diff extends Operation {
} else if (diff[i].removed) { } else if (diff[i].removed) {
if (showRemoved) output += "<span class='hl3'>" + Utils.escapeHtml(diff[i].value) + "</span>"; if (showRemoved) output += "<span class='hl3'>" + Utils.escapeHtml(diff[i].value) + "</span>";
} else if (!showSubtraction) { } else if (!showSubtraction) {
output += Utils.escapeHtml(diff[i].value) + "</span>"; output += Utils.escapeHtml(diff[i].value);
} }
} }

24
tests/operations/tests/StrUtils.mjs
View file

@ -15,7 +15,29 @@ TestRegister.addTests([
recipeConfig: [ recipeConfig: [
{ {
"op": "Diff", "op": "Diff",
"args": ["\\n\\n", "Character", true, true, false] "args": ["\\n\\n", "Character", true, true, false, false]
}
],
},
{
name: "Diff added with subtraction, basic usage",
input: "testing23\n\ntesting123",
expectedOutput: "<span class='hl5'>1</span>",
recipeConfig: [
{
"op": "Diff",
"args": ["\\n\\n", "Character", true, true, true, false]
}
],
},
{
name: "Diff removed with subtraction, basic usage",
input: "testing123\n\ntesting3",
expectedOutput: "<span class='hl3'>12</span>",
recipeConfig: [
{
"op": "Diff",
"args": ["\\n\\n", "Character", true, true, true, false]
} }
], ],
}, },