Merge pull request #234 from Turbo87/eslint

Use ESLint and prettier
mainmatter · Jan 4, 2019 · 36832d4 · 36832d4
2 parents f7e172d + 9b1cad9
commit 36832d4
Show file tree

Hide file tree

Showing 53 changed files with 1,923 additions and 1,526 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,20 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,13 +1,31 @@
+/* eslint-env node */
+
 module.exports = {
   root: true,
+  parser: 'typescript-eslint-parser',
   parserOptions: {
     ecmaVersion: 2017,
-    sourceType: 'module'
+    sourceType: 'module',
   },
-  extends: 'eslint:recommended',
+  plugins: ['prettier', 'typescript'],
+  extends: ['eslint:recommended', 'prettier'],
   env: {
-    browser: true
+    browser: true,
   },
   rules: {
-  }
+    'no-console': 'off',
+    'prettier/prettier': 'error',
+  },
+  overrides: [
+    {
+      files: ['**/*.ts'],
+      rules: {
+        // the TypeScript compiler already takes care of this and
+        // leaving it enabled results in false positives for interface imports
+        'no-dupe-class-members': 'off',
+        'no-unused-vars': 'off',
+        'no-undef': 'off',
+      },
+    },
+  ],
 };
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 /bower_components
 
 # misc
+/.eslintcache
 /.sass-cache
 /connect.lock
 /coverage/*

diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,7 @@
+/* eslint-env node */
+
+module.exports = {
+  singleQuote: true,
+  trailingComma: 'es5',
+  printWidth: 100,
+};
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ install:
   - yarn install --no-lockfile
 
 script:
+  - yarn lint
   - yarn run build
   - yarn run test:coverage --runInBand
   - yarn run test:ember

diff --git a/lib/.eslintrc.js b/lib/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
   env: {
-    node: true
+    node: true,
   },
 };
diff --git a/lib/__tests__/does-not-exist.ts b/lib/__tests__/does-not-exist.ts
@@ -15,38 +15,44 @@ describe('assert.dom(...).doesNotExist()', () => {
 
       assert.dom('h1').doesNotExist();
 
-      expect(assert.results).toEqual([{
-        actual: 'Element h1 exists once',
-        expected: 'Element h1 does not exist',
-        message: 'Element h1 does not exist',
-        result: false,
-      }]);
+      expect(assert.results).toEqual([
+        {
+          actual: 'Element h1 exists once',
+          expected: 'Element h1 does not exist',
+          message: 'Element h1 does not exist',
+          result: false,
+        },
+      ]);
     });
 
     test('fails if element exists multiple times', () => {
       document.body.innerHTML = '<div></div>'.repeat(3);
 
       assert.dom('div').doesNotExist();
 
-      expect(assert.results).toEqual([{
-        actual: 'Element div exists 3 times',
-        expected: 'Element div does not exist',
-        message: 'Element div does not exist',
-        result: false,
-      }]);
+      expect(assert.results).toEqual([
+        {
+          actual: 'Element div exists 3 times',
+          expected: 'Element div does not exist',
+          message: 'Element div does not exist',
+          result: false,
+        },
+      ]);
     });
 
     test('succeeds if element is missing', () => {
       document.body.innerHTML = '<h1 class="baz">foo</h1>bar';
 
       assert.dom('h2').doesNotExist();
 
-      expect(assert.results).toEqual([{
-        actual: 'Element h2 does not exist',
-        expected: 'Element h2 does not exist',
-        message: 'Element h2 does not exist',
-        result: true,
-      }]);
+      expect(assert.results).toEqual([
+        {
+          actual: 'Element h2 does not exist',
+          expected: 'Element h2 does not exist',
+          message: 'Element h2 does not exist',
+          result: true,
+        },
+      ]);
     });
   });
 
@@ -55,21 +61,27 @@ describe('assert.dom(...).doesNotExist()', () => {
 
     assert.dom('h2').doesNotExist('foo');
 
-    expect(assert.results).toEqual([{
-      actual: 'Element h2 does not exist',
-      expected: 'Element h2 does not exist',
-      message: 'foo',
-      result: true,
-    }]);
+    expect(assert.results).toEqual([
+      {
+        actual: 'Element h2 does not exist',
+        expected: 'Element h2 does not exist',
+        message: 'foo',
+        result: true,
+      },
+    ]);
   });
 
   test('throws for unexpected parameter types', () => {
-    expect(() => assert.dom(document.body).doesNotExist()).toThrow('Unexpected Parameter: [object HTMLBodyElement]');
+    expect(() => assert.dom(document.body).doesNotExist()).toThrow(
+      'Unexpected Parameter: [object HTMLBodyElement]'
+    );
 
     expect(() => assert.dom(5).doesNotExist()).toThrow('Unexpected Parameter: 5');
     expect(() => assert.dom(true).doesNotExist()).toThrow('Unexpected Parameter: true');
     expect(() => assert.dom(undefined).doesNotExist()).toThrow('Unexpected Parameter: undefined');
     expect(() => assert.dom({}).doesNotExist()).toThrow('Unexpected Parameter: [object Object]');
-    expect(() => assert.dom(document).doesNotExist()).toThrow('Unexpected Parameter: [object Document]');
+    expect(() => assert.dom(document).doesNotExist()).toThrow(
+      'Unexpected Parameter: [object Document]'
+    );
   });
 });
diff --git a/lib/__tests__/does-not-have-attribute.ts b/lib/__tests__/does-not-have-attribute.ts
@@ -1,6 +1,6 @@
 /* eslint-env jest */
 
-import TestAssertions from "../helpers/test-assertions";
+import TestAssertions from '../helpers/test-assertions';
 
 describe('assert.dom(...).doesNotHaveAttribute()', () => {
   let assert;
@@ -15,67 +15,87 @@ describe('assert.dom(...).doesNotHaveAttribute()', () => {
     assert.dom('input').doesNotHaveAttribute('disabled');
     assert.dom(document.querySelector('input')).doesNotHaveAttribute('disabled');
 
-    expect(assert.results).toEqual([{
-      actual: 'Element input does not have attribute "disabled"',
-      expected: 'Element input does not have attribute "disabled"',
-      message: 'Element input does not have attribute "disabled"',
-      result: true,
-    }, {
-      actual: 'Element input[type="password"][required] does not have attribute "disabled"',
-      expected: 'Element input[type="password"][required] does not have attribute "disabled"',
-      message: 'Element input[type="password"][required] does not have attribute "disabled"',
-      result: true,
-    }]);
+    expect(assert.results).toEqual([
+      {
+        actual: 'Element input does not have attribute "disabled"',
+        expected: 'Element input does not have attribute "disabled"',
+        message: 'Element input does not have attribute "disabled"',
+        result: true,
+      },
+      {
+        actual: 'Element input[type="password"][required] does not have attribute "disabled"',
+        expected: 'Element input[type="password"][required] does not have attribute "disabled"',
+        message: 'Element input[type="password"][required] does not have attribute "disabled"',
+        result: true,
+      },
+    ]);
   });
 
   test('fails for wrong content (string value)', () => {
     assert.dom('input').doesNotHaveAttribute('type');
     assert.dom(document.querySelector('input')).doesNotHaveAttribute('type');
 
-    expect(assert.results).toEqual([{
-      actual: 'Element input has attribute "type" with value "password"',
-      expected: 'Element input does not have attribute "type"',
-      message: 'Element input does not have attribute "type"',
-      result: false,
-    }, {
-      actual: 'Element input[type="password"][required] has attribute "type" with value "password"',
-      expected: 'Element input[type="password"][required] does not have attribute "type"',
-      message: 'Element input[type="password"][required] does not have attribute "type"',
-      result: false,
-    }]);
+    expect(assert.results).toEqual([
+      {
+        actual: 'Element input has attribute "type" with value "password"',
+        expected: 'Element input does not have attribute "type"',
+        message: 'Element input does not have attribute "type"',
+        result: false,
+      },
+      {
+        actual:
+          'Element input[type="password"][required] has attribute "type" with value "password"',
+        expected: 'Element input[type="password"][required] does not have attribute "type"',
+        message: 'Element input[type="password"][required] does not have attribute "type"',
+        result: false,
+      },
+    ]);
   });
 
   test('fails for wrong content (string value)', () => {
     assert.dom('input').doesNotHaveAttribute('required');
     assert.dom(document.querySelector('input')).doesNotHaveAttribute('required');
 
-    expect(assert.results).toEqual([{
-      actual: 'Element input has attribute "required" with value ""',
-      expected: 'Element input does not have attribute "required"',
-      message: 'Element input does not have attribute "required"',
-      result: false,
-    }, {
-      actual: 'Element input[type="password"][required] has attribute "required" with value ""',
-      expected: 'Element input[type="password"][required] does not have attribute "required"',
-      message: 'Element input[type="password"][required] does not have attribute "required"',
-      result: false,
-    }]);
+    expect(assert.results).toEqual([
+      {
+        actual: 'Element input has attribute "required" with value ""',
+        expected: 'Element input does not have attribute "required"',
+        message: 'Element input does not have attribute "required"',
+        result: false,
+      },
+      {
+        actual: 'Element input[type="password"][required] has attribute "required" with value ""',
+        expected: 'Element input[type="password"][required] does not have attribute "required"',
+        message: 'Element input[type="password"][required] does not have attribute "required"',
+        result: false,
+      },
+    ]);
   });
 
   test('fails for missing element', () => {
     assert.dom('#missing').doesNotHaveAttribute('disabled');
 
-    expect(assert.results).toEqual([{
-      message: 'Element #missing should exist',
-      result: false,
-    }]);
+    expect(assert.results).toEqual([
+      {
+        message: 'Element #missing should exist',
+        result: false,
+      },
+    ]);
   });
 
   test('throws for unexpected parameter types', () => {
     expect(() => assert.dom(5).doesNotHaveAttribute('disabled')).toThrow('Unexpected Parameter: 5');
-    expect(() => assert.dom(true).doesNotHaveAttribute('disabled')).toThrow('Unexpected Parameter: true');
-    expect(() => assert.dom(undefined).doesNotHaveAttribute('disabled')).toThrow('Unexpected Parameter: undefined');
-    expect(() => assert.dom({}).doesNotHaveAttribute('disabled')).toThrow('Unexpected Parameter: [object Object]');
-    expect(() => assert.dom(document).doesNotHaveAttribute('disabled')).toThrow('Unexpected Parameter: [object Document]');
+    expect(() => assert.dom(true).doesNotHaveAttribute('disabled')).toThrow(
+      'Unexpected Parameter: true'
+    );
+    expect(() => assert.dom(undefined).doesNotHaveAttribute('disabled')).toThrow(
+      'Unexpected Parameter: undefined'
+    );
+    expect(() => assert.dom({}).doesNotHaveAttribute('disabled')).toThrow(
+      'Unexpected Parameter: [object Object]'
+    );
+    expect(() => assert.dom(document).doesNotHaveAttribute('disabled')).toThrow(
+      'Unexpected Parameter: [object Document]'
+    );
   });
 });