Merge pull request #15 from pitch-io/simplify-preset

Simplify configuration and how the preset gets its config values

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: "jest-preset-cljest: Lint and run tests"
+name: Lint and tests
 
 on:
   push:
@@ -12,7 +12,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint-and-test:
+  cljest-tests:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cljest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+      - name: Setup Clojure
+        uses: DeLaGuardo/[email protected]
+        with:
+          cli: 1.11.1.1224
+      - name: Link jest-preset-cljest
+        run: npm link ../jest-preset-cljest
+      - name: Install npm dependencies
+        run: npm install
+      - name: Build Jest code
+        run: clojure -X cljest.compilation/compile
+      - name: Run cljest tests
+        run: npm run jest:ci
+
+  jest-preset-cljest-tests:
     runs-on: ubuntu-latest
     defaults:
       run:

cljest/jest.config.js

@@ -1,21 +1,9 @@
 const path = require('path')
-const { getPathsFromDepsEdn } = require('jest-preset-cljest/utils')
-
-const shadowOutputDir = path.resolve(__dirname, '.jest')
 
 module.exports = {
   setupFilesAfterEnv: [path.resolve(__dirname, 'jest.setup.js')],
-  testRegex: ['(.*)_spec.cljs'],
-  modulePaths: [shadowOutputDir],
-  rootDir: shadowOutputDir,
-  roots: getPathsFromDepsEdn(),
   reporters: ['default', ['jest-junit', { outputDirectory: 'reports/jest' }]],
   clearMocks: true,
 
-  globals: {
-    shadowOutputDir,
-    serverUrl: 'http://localhost:9111',
-  },
-
   preset: 'jest-preset-cljest',
 }

cljest/jest.setup.js

@@ -2,7 +2,7 @@ const path = require('path')
 const fs = require('fs')
 const config = require('./jest.config')
 
-const preloadFile = path.resolve(config.globals.shadowOutputDir, 'cljest.preloads.js')
+const preloadFile = path.resolve('.jest/cljest.preloads.js')
 
 // The preloads files may not exist if the initial compilation failed
 if (fs.existsSync(preloadFile)) {