Fix eslint setup
This commit is contained in:
parent
29a9236a6e
commit
0b3c3986c5
8 changed files with 44 additions and 49 deletions
|
|
@ -1,6 +1,11 @@
|
|||
# Skip coverage and build folders
|
||||
coverage/**
|
||||
dist/**
|
||||
|
||||
# Ignore symlink to build folder
|
||||
docs/assets/**
|
||||
|
||||
# Ignore HTML templates generated code
|
||||
src/**
|
||||
!src/*.js
|
||||
!src/ui/js/*.js
|
||||
coverage/**
|
||||
dist/**
|
||||
test/**
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
"check-coverage": "istanbul check-coverage --statements 90 --functions 90 --branches 85 --lines 90 ./coverage/coverage.json",
|
||||
"test": "npm run coverage && npm run check-coverage",
|
||||
"codacy": "cat ./coverage/lcov.info | codacy-coverage",
|
||||
"preversion": "npm run release && npm run release-website && npm test",
|
||||
"preversion": "npm run release && npm run release-website && npm run style && npm test",
|
||||
"version": "npm run release-bower && git add -A src dist docs package.json bower.json",
|
||||
"postversion": "git push && git push --tags"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ var DiffParser = require('../src/diff-parser.js').DiffParser;
|
|||
|
||||
describe('DiffParser', function() {
|
||||
describe('generateDiffJson', function() {
|
||||
|
||||
it('should parse unix with \n diff', function() {
|
||||
var diff =
|
||||
'diff --git a/sample b/sample\n' +
|
||||
|
|
@ -14,7 +13,7 @@ describe('DiffParser', function() {
|
|||
'@@ -1 +1 @@\n' +
|
||||
'-test\n' +
|
||||
'+test1r\n';
|
||||
checkDiffSample(diff)
|
||||
checkDiffSample(diff);
|
||||
});
|
||||
|
||||
it('should parse windows with \r\n diff', function() {
|
||||
|
|
@ -26,7 +25,7 @@ describe('DiffParser', function() {
|
|||
'@@ -1 +1 @@\r\n' +
|
||||
'-test\r\n' +
|
||||
'+test1r\r\n';
|
||||
checkDiffSample(diff)
|
||||
checkDiffSample(diff);
|
||||
});
|
||||
|
||||
it('should parse old os x with \r diff', function() {
|
||||
|
|
@ -38,7 +37,7 @@ describe('DiffParser', function() {
|
|||
'@@ -1 +1 @@\r' +
|
||||
'-test\r' +
|
||||
'+test1r\r';
|
||||
checkDiffSample(diff)
|
||||
checkDiffSample(diff);
|
||||
});
|
||||
|
||||
it('should parse mixed eols diff', function() {
|
||||
|
|
@ -50,7 +49,7 @@ describe('DiffParser', function() {
|
|||
'@@ -1 +1 @@\n' +
|
||||
'-test\r' +
|
||||
'+test1r\n';
|
||||
checkDiffSample(diff)
|
||||
checkDiffSample(diff);
|
||||
});
|
||||
|
||||
function checkDiffSample(diff) {
|
||||
|
|
@ -96,7 +95,7 @@ describe('DiffParser', function() {
|
|||
'+cenas com ananas\n' +
|
||||
'+bananas';
|
||||
|
||||
var result = DiffParser.generateDiffJson(diff, {"srcPrefix": "\t", "dstPrefix": "\t"});
|
||||
var result = DiffParser.generateDiffJson(diff, {'srcPrefix': '\t', 'dstPrefix': '\t'});
|
||||
var file1 = result[0];
|
||||
assert.equal(1, result.length);
|
||||
assert.equal(2, file1.addedLines);
|
||||
|
|
@ -574,6 +573,5 @@ describe('DiffParser', function() {
|
|||
assert.deepEqual(linesContent,
|
||||
[' function foo() {', '-var bar = "Whoops!";', '+var baz = "Whoops!";', ' }', ' ']);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ var filesExample1 =
|
|||
' </ol>\n' +
|
||||
'</div>';
|
||||
|
||||
|
||||
var htmlLineExample1 =
|
||||
'<div class="d2h-wrapper">\n' +
|
||||
' <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">\n' +
|
||||
|
|
@ -247,7 +246,6 @@ describe('Diff2Html', function() {
|
|||
assert.equal(null, result[0].blocks[0].lines[6].oldNumber);
|
||||
assert.equal(54, result[0].blocks[0].lines[6].newNumber);
|
||||
|
||||
|
||||
assert.equal(null, result[0].blocks[0].lines[7].oldNumber);
|
||||
assert.equal(55, result[0].blocks[0].lines[7].newNumber);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ var fileListPrinter = require('../src/file-list-printer.js').FileListPrinter;
|
|||
describe('FileListPrinter', function() {
|
||||
describe('generateFileList', function() {
|
||||
it('should work for all kinds of files', function() {
|
||||
|
||||
var files = [{
|
||||
addedLines: 12,
|
||||
deletedLines: 41,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ var LineByLinePrinter = require('../src/line-by-line-printer.js').LineByLinePrin
|
|||
describe('LineByLinePrinter', function() {
|
||||
describe('_generateEmptyDiff', function() {
|
||||
it('should return an empty diff', function() {
|
||||
|
||||
var lineByLinePrinter = new LineByLinePrinter({});
|
||||
var fileHtml = lineByLinePrinter._generateEmptyDiff();
|
||||
var expected = '<tr>\n' +
|
||||
|
|
@ -23,7 +22,6 @@ describe('LineByLinePrinter', function() {
|
|||
|
||||
describe('makeLineHtml', function() {
|
||||
it('should work for insertions', function() {
|
||||
|
||||
var diffParser = require('../src/diff-parser.js').DiffParser;
|
||||
var lineByLinePrinter = new LineByLinePrinter({});
|
||||
var fileHtml = lineByLinePrinter.makeLineHtml(false,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ var SideBySidePrinter = require('../src/side-by-side-printer.js').SideBySidePrin
|
|||
describe('SideBySidePrinter', function() {
|
||||
describe('generateEmptyDiff', function() {
|
||||
it('should return an empty diff', function() {
|
||||
|
||||
var sideBySidePrinter = new SideBySidePrinter({});
|
||||
var fileHtml = sideBySidePrinter.generateEmptyDiff();
|
||||
var expectedRight = '';
|
||||
|
|
@ -27,46 +26,46 @@ describe('SideBySidePrinter', function() {
|
|||
var sideBySidePrinter = new SideBySidePrinter({});
|
||||
|
||||
var file = {
|
||||
"blocks": [{
|
||||
"lines": [
|
||||
'blocks': [{
|
||||
'lines': [
|
||||
{
|
||||
"content": " context",
|
||||
"type": "d2h-cntx",
|
||||
"oldNumber": 19,
|
||||
"newNumber": 19
|
||||
'content': ' context',
|
||||
'type': 'd2h-cntx',
|
||||
'oldNumber': 19,
|
||||
'newNumber': 19
|
||||
},
|
||||
{
|
||||
"content": "-removed",
|
||||
"type": "d2h-del",
|
||||
"oldNumber": 20,
|
||||
"newNumber": null
|
||||
'content': '-removed',
|
||||
'type': 'd2h-del',
|
||||
'oldNumber': 20,
|
||||
'newNumber': null
|
||||
},
|
||||
{
|
||||
"content": "+added",
|
||||
"type": "d2h-ins",
|
||||
"oldNumber": null,
|
||||
"newNumber": 20
|
||||
'content': '+added',
|
||||
'type': 'd2h-ins',
|
||||
'oldNumber': null,
|
||||
'newNumber': 20
|
||||
},
|
||||
{
|
||||
"content": "+another added",
|
||||
"type": "d2h-ins",
|
||||
"oldNumber": null,
|
||||
"newNumber": 21
|
||||
'content': '+another added',
|
||||
'type': 'd2h-ins',
|
||||
'oldNumber': null,
|
||||
'newNumber': 21
|
||||
}
|
||||
],
|
||||
"oldStartLine": "19",
|
||||
"newStartLine": "19",
|
||||
"header": "@@ -19,7 +19,7 @@"
|
||||
'oldStartLine': '19',
|
||||
'newStartLine': '19',
|
||||
'header': '@@ -19,7 +19,7 @@'
|
||||
}],
|
||||
"deletedLines": 1,
|
||||
"addedLines": 1,
|
||||
"checksumBefore": "fc56817",
|
||||
"checksumAfter": "e8e7e49",
|
||||
"mode": "100644",
|
||||
"oldName": "coverage.init",
|
||||
"language": "init",
|
||||
"newName": "coverage.init",
|
||||
"isCombined": false
|
||||
'deletedLines': 1,
|
||||
'addedLines': 1,
|
||||
'checksumBefore': 'fc56817',
|
||||
'checksumAfter': 'e8e7e49',
|
||||
'mode': '100644',
|
||||
'oldName': 'coverage.init',
|
||||
'language': 'init',
|
||||
'newName': 'coverage.init',
|
||||
'isCombined': false
|
||||
};
|
||||
|
||||
var fileHtml = sideBySidePrinter.generateSideBySideFileHtml(file);
|
||||
|
|
@ -153,7 +152,6 @@ describe('SideBySidePrinter', function() {
|
|||
|
||||
describe('generateSingleLineHtml', function() {
|
||||
it('should work for insertions', function() {
|
||||
|
||||
var diffParser = require('../src/diff-parser.js').DiffParser;
|
||||
var sideBySidePrinter = new SideBySidePrinter({});
|
||||
var fileHtml = sideBySidePrinter.generateSingleLineHtml(false,
|
||||
|
|
@ -173,7 +171,6 @@ describe('SideBySidePrinter', function() {
|
|||
assert.equal(expected, fileHtml);
|
||||
});
|
||||
it('should work for deletions', function() {
|
||||
|
||||
var diffParser = require('../src/diff-parser.js').DiffParser;
|
||||
var sideBySidePrinter = new SideBySidePrinter({});
|
||||
var fileHtml = sideBySidePrinter.generateSingleLineHtml(false,
|
||||
|
|
|
|||
Loading…
Reference in a new issue