refactor: apply eslint rules

Cweili · Dec 10, 2019 · 57fe532 · 57fe532
1 parent 34d346c
commit 57fe532
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -21,7 +21,7 @@ export function isFunction(value) {
 export function each(collection, handler) {
   return collection && (Array.isArray(collection)
     ? collection.forEach(handler)
-    : Object.keys(collection).forEach(key => handler(collection[key], key)));
+    : Object.keys(collection).forEach((key) => handler(collection[key], key)));
 }
 
 export function assign(target, ...sources) {
@@ -55,7 +55,7 @@ export function parseJson(json) {
 }
 
 export function transformQuery(args) {
-  return Object.keys(args).sort().map(key => `${key}=${encode(args[key])}`).join('&');
+  return Object.keys(args).sort().map((key) => `${key}=${encode(args[key])}`).join('&');
 }
 
 export function fillUrl(method, path, data) {

diff --git a/test/methods.spec.js b/test/methods.spec.js
@@ -132,10 +132,6 @@ describe('req-json methods', () => {
       }, 1000);
     }));
 
-    try {
-      await reqJSON.get('/api/item/:id', 1, { timeout: 1 });
-    } catch (err) {
-      expect(err).toBeTruthy();
-    }
+    await expect(reqJSON.get('/api/item/:id', 1, { timeout: 1 })).rejects.toThrow();
   });
 });
diff --git a/test/middlewares.spec.js b/test/middlewares.spec.js
@@ -83,6 +83,7 @@ describe('req-json middlewares', () => {
         id: 1,
       });
     } catch (err) {
+      // eslint-disable-next-line jest/no-try-expect
       expect(err.message).toEqual('error');
     } finally {
       expect(middleware1).toHaveBeenCalled();
@@ -91,7 +92,7 @@ describe('req-json middlewares', () => {
   });
 
   it('should support options extend', async () => {
-    each([1, 2, 3], id => mock.get(`/api/item/${id}`, (req, res) => {
+    each([1, 2, 3], (id) => mock.get(`/api/item/${id}`, (req, res) => {
       expect(req.header('X-Test')).toBe(id);
       return res.status(204);
     }));
@@ -136,11 +137,7 @@ describe('req-json middlewares', () => {
   it('should throw error when middleware is not a function', async () => {
     const reqJSON = new ReqJSON();
 
-    try {
-      reqJSON.use(1);
-    } catch (err) {
-      expect(err).toBeTruthy();
-    }
+    expect(() => reqJSON.use(1)).toThrow();
   });
 
   it('should throw error when next call multiple times', async () => {
@@ -164,12 +161,8 @@ describe('req-json middlewares', () => {
       body: JSON.stringify(body),
     });
 
-    try {
-      await resource.get({
-        id: 1,
-      });
-    } catch (err) {
-      expect(err).toBeTruthy();
-    }
+    await expect(resource.get({
+      id: 1,
+    })).rejects.toThrow();
   });
 });