Merge pull request #61 from AthennaIO/develop

Use @athenna/test
AthennaIO · Mar 10, 2023 · f1f9968 · f1f9968
2 parents 0ed0897 + 581298f
commit f1f9968
Show file tree

Hide file tree

Showing 21 changed files with 338 additions and 297 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,11 @@ jobs:
 
       - name: Run tests
         run: npm run test:coverage
+        env:
+          SLACK_URL: ${{ secrets.SLACK_URL }}
+          DISCORD_URL: ${{ secrets.DISCORD_URL }}
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
 
       - name: Test code transpilation
         run: npm run build

diff --git a/bin/build.ts b/bin/build.ts
@@ -27,9 +27,7 @@ const path = Path.nodeModules('@athenna/tsconfig.build.json')
 | Create the tsconfig file for building the project.
 */
 
-const tsconfig = JSON.parse(
-  new File('../tsconfig.json').getContentSync().toString(),
-)
+const tsconfig = await new File('../tsconfig.json').getContentAsJson()
 
 delete tsconfig['ts-node']
 
@@ -39,8 +37,6 @@ tsconfig.compilerOptions.outDir = '../../build'
 tsconfig.include = ['../../src']
 tsconfig.exclude = ['../../bin', '../../node_modules', '../../tests']
 
-const tsconfigBuild = JSON.stringify(tsconfig)
-
 /*
 |--------------------------------------------------------------------------
 | Compilation
@@ -50,12 +46,7 @@ const tsconfigBuild = JSON.stringify(tsconfig)
 | compilation and deleting the tsconfig file generated.
 */
 
-const file = new File(path, Buffer.from(tsconfigBuild))
-
-if (file.fileExists) {
-  await file.remove()
-}
-
-await file.load()
+const file = new File(path, '')
+await file.setContent(JSON.stringify(tsconfig))
 await Exec.command(`rimraf ../build && tsc --project ${path}`)
 await file.remove()
diff --git a/bin/test.ts b/bin/test.ts
@@ -9,42 +9,11 @@
 
 import { assert } from '@japa/assert'
 import { Path } from '@athenna/common'
-import { pathToFileURL } from 'node:url'
+import { Importer } from '@athenna/test'
 import { EnvHelper } from '@athenna/config'
 import { specReporter } from '@japa/spec-reporter'
 import { configure, processCliArgs, run } from '@japa/runner'
 
-/*
-|--------------------------------------------------------------------------
-| Japa types
-|--------------------------------------------------------------------------
-|
-| Declare customized japa types.
-*/
-
-declare module '@japa/assert' {
-  export interface Assert {
-    throws(fn: () => any, errType: any, message?: string): void
-    doesNotThrows(fn: () => any, errType: any, message?: string): void
-    rejects(
-      fn: () => any | Promise<any>,
-      errType: any,
-      message?: string,
-    ): Promise<any>
-    doesNotRejects(
-      fn: () => any | Promise<any>,
-      errType: any,
-      message?: string,
-    ): Promise<any>
-  }
-}
-
-declare module '@japa/runner' {
-  interface TestContext {
-    assert: import('@japa/assert').Assert
-  }
-}
-
 /*
 |--------------------------------------------------------------------------
 | Set IS_TS env.
@@ -86,7 +55,7 @@ configure({
     files: ['tests/**/*Test.ts'],
     plugins: [assert()],
     reporters: [specReporter()],
-    importer: filePath => import(pathToFileURL(filePath).href),
+    importer: Importer.import,
     timeout: 5000,
   },
 })