Updated and linted

rsmbl · Aug 3, 2020 · 5165602 · 5165602
1 parent 6a753fd
commit 5165602
Show file tree

Hide file tree

Showing 10 changed files with 1,679 additions and 2,350 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,28 +1,16 @@
 {
-    "extends": [
-        "eslint-config-es5",
-        "eslint:recommended",
-        "plugin:prettier/recommended"
-    ],
+    "extends": ["eslint:recommended", "plugin:prettier/recommended"],
     "parserOptions": {
         "ecmaVersion": 2017,
         "sourceType": "module"
     },
     "rules": {
-        "prettier/prettier": [
-            "error",
-            {
-                "singleQuote": true,
-                "tabWidth": 4,
-                "printWidth": 160
-            }
-        ],
         "no-console": "off",
         "no-use-before-define": ["error", { "functions": false }],
         "func-names": ["off"],
         "complexity": ["error", 26],
         "curly": ["error", "all"],
-        "dot-location":  ["error", "property"],
+        "dot-location": ["error", "property"],
         "dot-notation": ["error"],
         "eqeqeq": ["error", "always"],
         "guard-for-in": "error",
@@ -37,11 +25,16 @@
         "no-shadow": "error",
         "global-require": "error",
         "comma-dangle": ["error", "never"],
-        "camelcase": ["error",{"properties": "always"}],
+        "camelcase": ["error", { "properties": "always" }],
         "no-prototype-builtins": "off"
     },
     "env": {
         "amd": true,
-        "es6": true
+        "es6": true,
+        "browser": true,
+        "node": true
+    },
+    "globals": {
+        "globalThis": false
     }
 }
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,8 @@
+{
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": false,
+    "endOfLine": "lf",
+    "printWidth": 160
+}
diff --git a/chai-tests/main_spec.js b/chai-tests/main_spec.js
diff --git a/nodejs-tests/compareImages.test.js b/nodejs-tests/compareImages.test.js
@@ -9,9 +9,7 @@ describe("compareImages", () => {
     test("Buffers data", async () => {
         const readImg1 = readFile("./demoassets/People.jpg");
         const readImg2 = readFile("./demoassets/People2.jpg");
-        const readComparison = readFile(
-            "./nodejs-tests/assets/PeopleComparedToPeople2.png"
-        );
+        const readComparison = readFile("./nodejs-tests/assets/PeopleComparedToPeople2.png");
 
         const data = await compareImages(await readImg1, await readImg2);
         const buffer = data.getBuffer();
@@ -27,23 +25,16 @@ describe("compareImages", () => {
     test("Buffer data includeOriginal", async () => {
         const readImg1 = readFile("./demoassets/People.jpg");
         const readImg2 = readFile("./demoassets/People2.jpg");
-        const readComparison = readFile(
-            "./nodejs-tests/assets/PeopleComparedToPeople2WithOriginal.png"
-        );
+        const readComparison = readFile("./nodejs-tests/assets/PeopleComparedToPeople2WithOriginal.png");
         const data = await compareImages(await readImg1, await readImg2);
         const buffer = data.getBuffer(true);
         const comparison = await readComparison;
         expect(buffer.equals(comparison)).toBe(true);
     });
 
     test("throws when failed", async () => {
-        const promise = compareImages(
-            fs.readFileSync("./demoassets/People.jpg"),
-            "bogus data"
-        );
-        await expect(promise).rejects.toMatch(
-            "Error: ENOENT, No such file or directory 'bogus data'"
-        );
+        const promise = compareImages(fs.readFileSync("./demoassets/People.jpg"), "bogus data");
+        await expect(promise).rejects.toMatch("Error: ENOENT, No such file or directory 'bogus data'");
     });
 
     test("returns early", async () => {
@@ -52,11 +43,7 @@ describe("compareImages", () => {
         const options = {
             returnEarlyThreshold: 5
         };
-        const data = await compareImages(
-            await readImg1,
-            await readImg2,
-            options
-        );
+        const data = await compareImages(await readImg1, await readImg2, options);
 
         expect(data.misMatchPercentage).toEqual("5.00");
     });

diff --git a/nodejs-tests/errorPixelTransform.test.js b/nodejs-tests/errorPixelTransform.test.js
@@ -3,11 +3,11 @@
 const resemble = require("../resemble");
 const fs = require("fs");
 
-const testErrorPixelTransform = transform => {
+const testErrorPixelTransform = (transform) => {
     const people = fs.readFileSync("./demoassets/ghost1.png");
     const people2 = fs.readFileSync("./demoassets/ghost2.png");
 
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         resemble.outputSettings({
             errorType: transform,
             errorColor: {
@@ -19,16 +19,14 @@ const testErrorPixelTransform = transform => {
 
         resemble(people)
             .compareTo(people2)
-            .onComplete(data => {
+            .onComplete((data) => {
                 const buffer = data.getBuffer();
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
                 // fs.writeFileSync(`./nodejs-tests/assets/pixelErrorTransform/${transform}.new.png`, buffer);
 
-                const comparison = fs.readFileSync(
-                    `./nodejs-tests/assets/pixelErrorTransform/${transform}.png`
-                );
+                const comparison = fs.readFileSync(`./nodejs-tests/assets/pixelErrorTransform/${transform}.png`);
 
                 expect(buffer.equals(comparison)).toBe(true);
                 resolve();
@@ -41,11 +39,9 @@ describe("errorPixelTransform", () => {
 
     test("movement", async () => testErrorPixelTransform("movement"));
 
-    test("flatDifferenceIntensity", async () =>
-        testErrorPixelTransform("flatDifferenceIntensity"));
+    test("flatDifferenceIntensity", async () => testErrorPixelTransform("flatDifferenceIntensity"));
 
-    test("movementDifferenceIntensity", async () =>
-        testErrorPixelTransform("movementDifferenceIntensity"));
+    test("movementDifferenceIntensity", async () => testErrorPixelTransform("movementDifferenceIntensity"));
 
     test("diffOnly", async () => testErrorPixelTransform("diffOnly"));
 });
diff --git a/nodejs-tests/ignore.test.js b/nodejs-tests/ignore.test.js
@@ -8,7 +8,7 @@ describe("ignore", () => {
         const text = fs.readFileSync("./nodejs-tests/assets/text.png");
         const textAa = fs.readFileSync("./nodejs-tests/assets/textAa.png");
 
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             const opts = { ignore: "antialiasing" };
 
             resemble.compare(text, textAa, opts, (_x, data) => {
@@ -17,9 +17,7 @@ describe("ignore", () => {
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
-                const comparison = fs.readFileSync(
-                    "./nodejs-tests/assets/isAntialiased/diffOn.png"
-                );
+                const comparison = fs.readFileSync("./nodejs-tests/assets/isAntialiased/diffOn.png");
 
                 expect(buffer.equals(comparison)).toBe(true);
                 resolve();
@@ -31,16 +29,14 @@ describe("ignore", () => {
         const text = fs.readFileSync("./nodejs-tests/assets/text.png");
         const textAa = fs.readFileSync("./nodejs-tests/assets/textAa.png");
 
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             resemble.compare(text, textAa, {}, (_x, data) => {
                 expect(data.misMatchPercentage).toBe("5.19");
                 const buffer = data.getBuffer();
 
                 expect(buffer).toBeInstanceOf(Buffer);
 
-                const comparison = fs.readFileSync(
-                    "./nodejs-tests/assets/isAntialiased/diffOff.png"
-                );
+                const comparison = fs.readFileSync("./nodejs-tests/assets/isAntialiased/diffOff.png");
 
                 expect(buffer.equals(comparison)).toBe(true);
                 resolve();