fix: nightwatch integration (#386)

cexbrayat · web-flow · commit 5c4926e10c54 · 2023-11-27T15:37:42.000+08:00
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/test.mjs b/scripts/test.mjs
@@ -1,9 +1,6 @@
 #!/usr/bin/env zx
 import 'zx/globals'
 
-// Vitest would otherwise enable watch mode by default.
-process.env.CI = '1'
-
 const playgroundDir = path.resolve(__dirname, '../playground/')
 let projects = fs
   .readdirSync(playgroundDir, { withFileTypes: true })
@@ -21,7 +18,13 @@ for (const projectName of projects) {
   cd(path.resolve(playgroundDir, projectName))
   const packageJSON = require(path.resolve(playgroundDir, projectName, 'package.json'))
 
-  console.log(`Building ${projectName}`)
+  console.log(`
+  
+#####
+Building ${projectName}
+#####
+  
+  `)
   await $`pnpm build`
 
   if ('@playwright/test' in packageJSON.devDependencies) {
@@ -35,6 +38,16 @@ for (const projectName of projects) {
 
   if ('test:unit' in packageJSON.scripts) {
     console.log(`Running unit tests in ${projectName}`)
-    await $`pnpm test:unit`
+    if (projectName.includes('vitest') || projectName.includes('with-tests')) {
+      // Vitest would otherwise enable watch mode by default.
+      await $`CI=1 pnpm test:unit`
+    } else {
+      await $`pnpm test:unit`
+    }
+  }
+
+  if ('type-check' in packageJSON.scripts) {
+    console.log(`Running type-check in ${projectName}`)
+    await $`pnpm type-check`
   }
 }
diff --git a/template/base/package.json b/template/base/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.5.0",
-    "vite": "^5.0.1"
+    "vite": "^5.0.2"
   }
 }
diff --git a/template/config/nightwatch-ct/package.json b/template/config/nightwatch-ct/package.json
@@ -1,8 +1,11 @@
 {
   "scripts": {
-    "test:unit": "nightwatch src/components/**/__tests__/*"
+    "test:unit": "nightwatch src/**/__tests__/*"
   },
   "dependencies": {
     "vue": "^3.3.8"
+  },
+  "devDependencies": {
+    "@vue/test-utils": "^2.4.2"
   }
 }
diff --git a/template/config/nightwatch/nightwatch.conf.js b/template/config/nightwatch/nightwatch.conf.js
@@ -30,10 +30,11 @@ module.exports = {
   plugins: ['@nightwatch/vue'],
 
   // See https://nightwatchjs.org/guide/concepts/test-globals.html#external-test-globals
-  globals_path: 'nightwatch/globals.js',
+  globals_path: '',
 
   vite_dev_server: {
-    start_vite: false
+    start_vite: true,
+    port: process.env.CI ? 4173 : 5173
   },
 
   webdriver: {},
diff --git a/template/config/nightwatch/nightwatch/globals.js b/template/config/nightwatch/nightwatch/globals.js
diff --git a/template/config/nightwatch/package.json b/template/config/nightwatch/package.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "test:e2e": "nightwatch tests/e2e"
+    "test:e2e": "nightwatch tests/e2e/*"
   },
   "devDependencies": {
     "nightwatch": "^3.3.2",
@@ -9,7 +9,6 @@
     "@types/nightwatch": "^2.3.28",
     "geckodriver": "^4.2.1",
     "chromedriver": "^119.0.0",
-    "ts-node": "^10.9.1",
-    "wait-on": "^7.2.0"
+    "ts-node": "^10.9.1"
   }
 }
diff --git a/template/config/nightwatch/tests/e2e/example.js b/template/config/nightwatch/tests/e2e/example.js
@@ -4,10 +4,7 @@ describe('My First Test', function () {
   })
 
   it('visits the app root url', function () {
-    browser.assert
-      .textContains('.green', 'You did it!')
-      .assert.elementHasCount('.wrapper nav a', 2)
-      .strictClick('.wrapper nav a:last-child')
+    browser.assert.textContains('.green', 'You did it!')
   })
 
   after((browser) => browser.end())
diff --git a/template/tsconfig/nightwatch/nightwatch/tsconfig.json b/template/tsconfig/nightwatch/nightwatch/tsconfig.json
@@ -3,14 +3,15 @@
   "compilerOptions": {
     "target": "ESNext",
     "module": "commonjs",
+    "moduleResolution": "node",
     "composite": true,
     "rootDir": "../",
     "lib": ["ESNext", "dom"],
     "types": ["nightwatch"]
   },
   "include": ["../node_modules/@nightwatch/**/*", "../src/components/**/*", "../tests/e2e/**/*"],
   "ts-node": {
-    "files": true
+    "transpileOnly": true
   },
   "files": ["nightwatch.d.ts"]
 }
diff --git a/utils/filterList.ts b/utils/filterList.ts
@@ -1,5 +1 @@
-export const FILES_TO_FILTER = [
-  'nightwatch.e2e.conf.js',
-  'nightwatch.component.conf.js',
-  'globals.js'
-]
+export const FILES_TO_FILTER = ['nightwatch.e2e.conf.js', 'nightwatch.component.conf.js']

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`},`
`11`	`11`	`"devDependencies": {`
`12`	`12`	`"@vitejs/plugin-vue": "^4.5.0",`
`13`		`- "vite": "^5.0.1"`
	`13`	`+ "vite": "^5.0.2"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"scripts": {`
`3`		`- "test:unit": "nightwatch src/components/*/__tests__/"`
	`3`	`+ "test:unit": "nightwatch src/*/__tests__/"`
`4`	`4`	`},`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"vue": "^3.3.8"`
	`7`	`+ },`
	`8`	`+ "devDependencies": {`
	`9`	`+ "@vue/test-utils": "^2.4.2"`
`7`	`10`	`}`
`8`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"scripts": {`
`3`		`- "test:e2e": "nightwatch tests/e2e"`
	`3`	`+ "test:e2e": "nightwatch tests/e2e/*"`
`4`	`4`	`},`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"nightwatch": "^3.3.2",`
`@@ -9,7 +9,6 @@`
`9`	`9`	`"@types/nightwatch": "^2.3.28",`
`10`	`10`	`"geckodriver": "^4.2.1",`
`11`	`11`	`"chromedriver": "^119.0.0",`
`12`		`- "ts-node": "^10.9.1",`
`13`		`- "wait-on": "^7.2.0"`
	`12`	`+ "ts-node": "^10.9.1"`
`14`	`13`	`}`
`15`	`14`	`}`