From 81ab472fe172c0a9717935e35e9e7b84a40c7a94 Mon Sep 17 00:00:00 2001
From: curbengh <43627182+curbengh@users.noreply.github.com>
Date: Thu, 9 Jan 2020 15:14:25 +0000
Subject: [PATCH] test: utilise toThrow() to catch error

- try...catch would (incorrectly) pass the test, despite having no error
---
 test/css.test.js  | 11 +++--------
 test/gzip.test.js |  7 ++-----
 test/js.test.js   |  8 ++++----
 test/json.test.js |  6 +-----
 test/svg.test.js  |  7 ++-----
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/test/css.test.js b/test/css.test.js
index 141f56c..3773798 100644
--- a/test/css.test.js
+++ b/test/css.test.js
@@ -65,20 +65,15 @@ describe('css', () => {
     }
     hexo.config.minify.css = customOpt
 
-    let result, expected
-
-    try {
-      await c(input, { path })
-    } catch (err) {
-      result = err.message
-    }
+    let expected
     try {
       await new CleanCSS(customOpt).minify(input)
     } catch (err) {
       expected = err.message
     }
 
-    expect(result).toContain(expected)
+    expect(expected).toBeDefined()
+    await expect(c(input, { path })).rejects.toThrow(expected)
   })
 
   test('exclude - *.min.css', async () => {
diff --git a/test/gzip.test.js b/test/gzip.test.js
index 1040618..98eaaaf 100644
--- a/test/gzip.test.js
+++ b/test/gzip.test.js
@@ -99,11 +99,8 @@ describe('gzip', () => {
     } catch (err) {
       expected = err.message
     }
-    try {
-      await g()
-    } catch (err) {
-      expect(err.message).toContain(expected)
-    }
+    expect(expected).toBeDefined()
+    await expect(g()).rejects.toThrow(expected)
   })
 
   test('include - exclude non-text file by default', async () => {
diff --git a/test/js.test.js b/test/js.test.js
index e269c68..686b59a 100644
--- a/test/js.test.js
+++ b/test/js.test.js
@@ -69,11 +69,11 @@ describe('js', () => {
     hexo.config.minify.js = customOpt
 
     const { error } = Terser.minify(input, customOpt)
-    try {
+
+    expect(error.message).toBeDefined()
+    expect(() => {
       j(input, { path })
-    } catch (err) {
-      expect(err.message).toContain(error.message)
-    }
+    }).toThrow(error.message)
   })
 
   test('exclude - *.min.js', () => {
diff --git a/test/json.test.js b/test/json.test.js
index 1e2784b..6d9d01c 100644
--- a/test/json.test.js
+++ b/test/json.test.js
@@ -51,11 +51,7 @@ describe('xml', () => {
 
   test('invalid input', async () => {
     hexo.route.set(path, 'foo')
-    try {
-      await jsonFn()
-    } catch (err) {
-      expect(err.message).toContain('SyntaxError')
-    }
+    await expect(jsonFn()).rejects.toThrow(/SyntaxError/)
   })
 
   test('empty file', async () => {
diff --git a/test/svg.test.js b/test/svg.test.js
index 84ace84..24744d7 100644
--- a/test/svg.test.js
+++ b/test/svg.test.js
@@ -81,11 +81,8 @@ describe('svg', () => {
     } catch (err) {
       expected = err
     }
-    try {
-      await s()
-    } catch (err) {
-      expect(err.message).toContain(expected)
-    }
+    expect(expected).toBeDefined()
+    await expect(s()).rejects.toThrow(expected)
   })
 
   test('include - exclude *.min.svg by default', async () => {