Skip to content

Commit

Permalink
Merge pull request #1621 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Jul 9, 2021
2 parents a0e5ae7 + 74cb51d commit b34281a
Show file tree
Hide file tree
Showing 5 changed files with 1,617 additions and 2,307 deletions.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,32 +47,32 @@
},
"homepage": "https://github.com/blackflux/object-scan#readme",
"devDependencies": {
"@babel/cli": "7.13.16",
"@babel/core": "7.14.2",
"@babel/register": "7.13.16",
"@babel/cli": "7.14.5",
"@babel/core": "7.14.6",
"@babel/register": "7.14.5",
"@blackflux/eslint-plugin-rules": "2.0.3",
"@blackflux/robo-config-plugin": "5.1.0",
"@blackflux/robo-config-plugin": "5.2.4",
"babel-eslint": "10.1.0",
"babel-preset-latest-node": "5.5.1",
"chai": "4.3.4",
"coveralls": "3.1.0",
"coveralls": "3.1.1",
"diff": "5.0.0",
"diff2html": "3.4.4",
"eslint": "7.26.0",
"diff2html": "3.4.7",
"eslint": "7.30.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-import": "2.23.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-json": "3.0.0",
"eslint-plugin-markdown": "2.1.0",
"eslint-plugin-mocha": "8.1.0",
"eslint-plugin-markdown": "2.2.0",
"eslint-plugin-mocha": "9.0.0",
"joi-strict": "2.0.0",
"js-gardener": "3.0.3",
"json-stringify-pretty-compact": "3.0.0",
"lodash.isequal": "4.5.0",
"mustache": "4.2.0",
"node-tdd": "3.0.4",
"nyc": "15.1.0",
"object-scan": "15.0.1",
"semantic-release": "17.4.3",
"object-scan": "16.0.2",
"semantic-release": "17.4.4",
"smart-fs": "2.0.2",
"stringify-object": "3.3.0",
"uuid": "8.3.2"
Expand Down
12 changes: 10 additions & 2 deletions test/helper.spec/create-html-diff.spec.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
const expect = require('chai').expect;
const fs = require('smart-fs');
const path = require('path');
const { describe } = require('node-tdd');
const createHtmlDiff = require('../helper/create-html-diff');

describe('Testing create-html-diff.js', () => {
it('Testing example', ({ fixture }) => {
const r = createHtmlDiff('name', { a: 1 }, { a: 1, b: 2 });
expect(r.split('\n')).to.deep.equal(fixture('example'));
expect(fs.smartWrite(
path.join(`${__filename}__fixtures`, 'example.html'),
r.split('\n')
)).to.equal(false);
});

it('Testing example with meta', ({ fixture }) => {
const r = createHtmlDiff('name', { a: 1 }, { a: 1, b: 2 }, {
bool: true,
data: { value: 1 }
});
expect(r.split('\n')).to.deep.equal(fixture('example-with-meta'));
expect(fs.smartWrite(
path.join(`${__filename}__fixtures`, 'example-with-meta.html'),
r.split('\n')
)).to.equal(false);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<div class="d2h-code-side-line d2h-info">@@ -1,3 +1,4 @@</div>
<div class="d2h-code-side-line">@@ -1,3 +1,4 @@</div>
</td>
</tr><tr>
<td class="d2h-code-side-linenumber d2h-cntx">
1
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">{</span>
</div>
Expand All @@ -45,7 +45,7 @@
2
</td>
<td class="d2h-del d2h-change">
<div class="d2h-code-side-line d2h-del d2h-change">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">-</span>
<span class="d2h-code-line-ctn"> &quot;a&quot;: 1</span>
</div>
Expand All @@ -54,7 +54,7 @@
<td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
</td>
<td class="d2h-cntx d2h-emptyplaceholder">
<div class="d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
<div class="d2h-code-side-line d2h-code-side-emptyplaceholder">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn"><br></span>
</div>
Expand All @@ -64,7 +64,7 @@
3
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">}</span>
</div>
Expand All @@ -81,14 +81,14 @@
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<div class="d2h-code-side-line d2h-info"></div>
<div class="d2h-code-side-line"></div>
</td>
</tr><tr>
<td class="d2h-code-side-linenumber d2h-cntx">
1
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">{</span>
</div>
Expand All @@ -98,7 +98,7 @@
2
</td>
<td class="d2h-ins d2h-change">
<div class="d2h-code-side-line d2h-ins d2h-change">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">+</span>
<span class="d2h-code-line-ctn"> &quot;a&quot;: 1<ins>,</ins></span>
</div>
Expand All @@ -108,7 +108,7 @@
3
</td>
<td class="d2h-ins">
<div class="d2h-code-side-line d2h-ins">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">+</span>
<span class="d2h-code-line-ctn"> &quot;b&quot;: 2</span>
</div>
Expand All @@ -118,7 +118,7 @@
4
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">}</span>
</div>
Expand Down
20 changes: 10 additions & 10 deletions test/helper.spec/create-html-diff.spec.js__fixtures/example.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<div class="d2h-code-side-line d2h-info">@@ -1,3 +1,4 @@</div>
<div class="d2h-code-side-line">@@ -1,3 +1,4 @@</div>
</td>
</tr><tr>
<td class="d2h-code-side-linenumber d2h-cntx">
1
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">{</span>
</div>
Expand All @@ -45,7 +45,7 @@
2
</td>
<td class="d2h-del d2h-change">
<div class="d2h-code-side-line d2h-del d2h-change">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">-</span>
<span class="d2h-code-line-ctn"> &quot;a&quot;: 1</span>
</div>
Expand All @@ -54,7 +54,7 @@
<td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
</td>
<td class="d2h-cntx d2h-emptyplaceholder">
<div class="d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
<div class="d2h-code-side-line d2h-code-side-emptyplaceholder">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn"><br></span>
</div>
Expand All @@ -64,7 +64,7 @@
3
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">}</span>
</div>
Expand All @@ -81,14 +81,14 @@
<tr>
<td class="d2h-code-side-linenumber d2h-info"></td>
<td class="d2h-info">
<div class="d2h-code-side-line d2h-info"></div>
<div class="d2h-code-side-line"></div>
</td>
</tr><tr>
<td class="d2h-code-side-linenumber d2h-cntx">
1
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">{</span>
</div>
Expand All @@ -98,7 +98,7 @@
2
</td>
<td class="d2h-ins d2h-change">
<div class="d2h-code-side-line d2h-ins d2h-change">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">+</span>
<span class="d2h-code-line-ctn"> &quot;a&quot;: 1<ins>,</ins></span>
</div>
Expand All @@ -108,7 +108,7 @@
3
</td>
<td class="d2h-ins">
<div class="d2h-code-side-line d2h-ins">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">+</span>
<span class="d2h-code-line-ctn"> &quot;b&quot;: 2</span>
</div>
Expand All @@ -118,7 +118,7 @@
4
</td>
<td class="d2h-cntx">
<div class="d2h-code-side-line d2h-cntx">
<div class="d2h-code-side-line">
<span class="d2h-code-line-prefix">&nbsp;</span>
<span class="d2h-code-line-ctn">}</span>
</div>
Expand Down
Loading

0 comments on commit b34281a

Please sign in to comment.