Skip to content

Commit

Permalink
Merge branch 'depfu/update/npm/eslint-4.19.1'
Browse files Browse the repository at this point in the history
* depfu/update/npm/eslint-4.19.1:
  eslint --fix .
  Add /site-build/ to .eslintignore
  Fix .eslintrc.js
  Upgrade eslint-config-onelint to version 3.0.0
  Upgrade eslint to version 4.19.1
  • Loading branch information
papandreou committed Apr 15, 2018
2 parents cbae661 + dba5f76 commit 9b9cf3b
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 46 deletions.
7 changes: 4 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
coverage
test/documentation.spec.js
/node_modules/
/coverage/
/test/documentation.spec.js
/site-build/
3 changes: 1 addition & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ module.exports = {
],
env: {
es6: false
},
parserOptions: null
}
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"devDependencies": {
"coveralls": "2.11.2",
"eslint": "2.13.1",
"eslint-config-onelint": "1.2.0",
"eslint": "4.19.1",
"eslint-config-onelint": "3.0.0",
"istanbul": "0.4.5",
"minimist": "1.1.1",
"mocha": "2.3.3",
Expand Down
78 changes: 39 additions & 39 deletions test/unexpectedExif.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,54 +25,54 @@ describe('unexpected-exif', function () {
}
});
}, 'to throw',
"expected " + testImagePath + " (image/jpeg)\n" +
'expected ' + testImagePath + ' (image/jpeg)\n' +
"to have EXIF data satisfying { tags: { Make: 'Apple', ShutterSpeedValue: expect.it('to be within', 8, 9) } }\n" +
"\n" +
"{\n" +
" tags: {\n" +
'\n' +
'{\n' +
' tags: {\n' +
" Make: 'Apple',\n" +
" Model: 'iPhone 6',\n" +
" Orientation: 6,\n" +
" XResolution: 72,\n" +
" YResolution: 72,\n" +
" ResolutionUnit: 2,\n" +
' Orientation: 6,\n' +
' XResolution: 72,\n' +
' YResolution: 72,\n' +
' ResolutionUnit: 2,\n' +
" Software: '8.1.1',\n" +
" ModifyDate: '2014:12:01 11:01:21',\n" +
" YCbCrPositioning: 1,\n" +
" ExposureTime: 0.025,\n" +
" FNumber: 2.2,\n" +
" ExposureProgram: 2,\n" +
" ISO: 32,\n" +
" DateTimeOriginal: 1417431681,\n" +
" CreateDate: 1417431681,\n" +
" ShutterSpeedValue: 5.322274881516588, // should be within 8..9\n" +
" ApertureValue: 2.2750071245369052,\n" +
" BrightnessValue: 4.812554489973845,\n" +
" ExposureCompensation: 0,\n" +
" MeteringMode: 5,\n" +
" Flash: 16,\n" +
" FocalLength: 4.15,\n" +
" SubjectArea: [ 1631, 1223, 1795, 1077 ],\n" +
' YCbCrPositioning: 1,\n' +
' ExposureTime: 0.025,\n' +
' FNumber: 2.2,\n' +
' ExposureProgram: 2,\n' +
' ISO: 32,\n' +
' DateTimeOriginal: 1417431681,\n' +
' CreateDate: 1417431681,\n' +
' ShutterSpeedValue: 5.322274881516588, // should be within 8..9\n' +
' ApertureValue: 2.2750071245369052,\n' +
' BrightnessValue: 4.812554489973845,\n' +
' ExposureCompensation: 0,\n' +
' MeteringMode: 5,\n' +
' Flash: 16,\n' +
' FocalLength: 4.15,\n' +
' SubjectArea: [ 1631, 1223, 1795, 1077 ],\n' +
" SubSecTimeOriginal: '222',\n" +
" SubSecTimeDigitized: '222',\n" +
" ColorSpace: 1,\n" +
" ExifImageWidth: 3264,\n" +
" ExifImageHeight: 2448,\n" +
" SensingMethod: 2,\n" +
" ExposureMode: 0,\n" +
" WhiteBalance: 0,\n" +
" FocalLengthIn35mmFormat: 29,\n" +
" SceneCaptureType: 0,\n" +
" LensInfo: [ 4.15, 4.15, 2.2, 2.2 ],\n" +
' ColorSpace: 1,\n' +
' ExifImageWidth: 3264,\n' +
' ExifImageHeight: 2448,\n' +
' SensingMethod: 2,\n' +
' ExposureMode: 0,\n' +
' WhiteBalance: 0,\n' +
' FocalLengthIn35mmFormat: 29,\n' +
' SceneCaptureType: 0,\n' +
' LensInfo: [ 4.15, 4.15, 2.2, 2.2 ],\n' +
" LensMake: 'Apple',\n" +
" LensModel: 'iPhone 6 back camera 4.15mm f/2.2'\n" +
" },\n" +
" imageSize: { height: 2448, width: 3264 },\n" +
" thumbnailOffset: 1678,\n" +
" thumbnailLength: 4476,\n" +
" thumbnailType: 6,\n" +
" app1Offset: 6\n" +
"}"
' },\n' +
' imageSize: { height: 2448, width: 3264 },\n' +
' thumbnailOffset: 1678,\n' +
' thumbnailLength: 4476,\n' +
' thumbnailType: 6,\n' +
' app1Offset: 6\n' +
'}'
);
});
});
Expand Down

0 comments on commit 9b9cf3b

Please sign in to comment.