Enable jest/no-try-expect (vercel#13124)

chibicode · May 21, 2020 · e0cc902 · e0cc902
1 parent 247cb0e
commit e0cc902
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -26,8 +26,7 @@
       "extends": ["plugin:jest/recommended"],
       "rules": {
         "jest/expect-expect": "off",
-        "jest/no-disabled-tests": "off",
-        "jest/no-try-expect": "off"
+        "jest/no-disabled-tests": "off"
       }
     },
     { "files": ["**/__tests__/**"], "env": { "jest": true } },

diff --git a/test/integration/create-next-app/index.test.js b/test/integration/create-next-app/index.test.js
@@ -45,6 +45,7 @@ describe('create next app', () => {
       try {
         await runStarter(cwd, projectName)
       } catch (e) {
+        // eslint-disable-next-line jest/no-try-expect
         expect(e.stdout).toMatch(/contains files that could conflict/)
       }
     })
@@ -76,6 +77,7 @@ describe('create next app', () => {
       try {
         await run(cwd, projectName, '--example', 'not a real example')
       } catch (e) {
+        // eslint-disable-next-line jest/no-try-expect
         expect(e.stderr).toMatch(/Could not locate an example named/i)
       }
       expect(

diff --git a/test/isolated/config.test.js b/test/isolated/config.test.js
@@ -66,16 +66,12 @@ describe('config', () => {
   })
 
   it('Should throw when an invalid target is provided', () => {
-    try {
+    expect(() => {
       loadConfig(
         PHASE_DEVELOPMENT_SERVER,
         join(__dirname, '_resolvedata', 'invalid-target')
       )
-      // makes sure we don't just pass if the loadConfig passes while it should fail
-      throw new Error('failed')
-    } catch (err) {
-      expect(err.message).toMatch(/Specified target is invalid/)
-    }
+    }).toThrow(/Specified target is invalid/)
   })
 
   it('Should pass when a valid target is provided', () => {
@@ -87,18 +83,14 @@ describe('config', () => {
   })
 
   it('Should throw an error when next.config.js is not present', () => {
-    try {
+    expect(() =>
       loadConfig(
         PHASE_DEVELOPMENT_SERVER,
         join(__dirname, '_resolvedata', 'typescript-config')
       )
-      // makes sure we don't just pass if the loadConfig passes while it should fail
-      throw new Error('failed')
-    } catch (err) {
-      expect(err.message).toMatch(
-        /Configuring Next.js via .+ is not supported. Please replace the file with 'next.config.js'./
-      )
-    }
+    ).toThrow(
+      /Configuring Next.js via .+ is not supported. Please replace the file with 'next.config.js'/
+    )
   })
 
   it('Should not throw an error when two versions of next.config.js are present', () => {

diff --git a/test/isolated/require-page.test.js b/test/isolated/require-page.test.js
@@ -25,6 +25,7 @@ describe('pageNotFoundError', () => {
     try {
       throw pageNotFoundError('test')
     } catch (err) {
+      // eslint-disable-next-line jest/no-try-expect
       expect(err.code).toBe('ENOENT')
     }
   })
@@ -89,6 +90,7 @@ describe('requirePage', () => {
     try {
       await requirePage('/../../test', distDir)
     } catch (err) {
+      // eslint-disable-next-line jest/no-try-expect
       expect(err.code).toBe('ENOENT')
     }
   })
@@ -98,6 +100,7 @@ describe('requirePage', () => {
     try {
       await requirePage('/non-existent', distDir)
     } catch (err) {
+      // eslint-disable-next-line jest/no-try-expect
       expect(err.code).toBe('ENOENT')
     }
   })
@@ -107,6 +110,7 @@ describe('requirePage', () => {
     try {
       await requirePage('/non-existent-child', distDir)
     } catch (err) {
+      // eslint-disable-next-line jest/no-try-expect
       expect(err.code).toBe('MODULE_NOT_FOUND')
     }
   })