chore: fix actions

benmccann · Feb 28, 2023 · 7716598 · 7716598
1 parent 5c25860
commit 7716598
Show file tree

Hide file tree

Showing 7 changed files with 1,311 additions and 12,449 deletions.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -4,17 +4,13 @@ jobs:
   unit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
+          cache: "yarn"
       - name: install
-        run: npm ci
-      - name: install-test
-        working-directory: ./packages/view360/test/unit
-        run: npm ci
+        run: yarn install --immutable --immutable-cache --check-cache
       - name: run unit test
-        working-directory: ./packages/view360/test/unit
-        run: npm run test
+        working-directory: ./packages/view360
+        run: yarn test
diff --git a/packages/view360/test/unit/karma.conf.js → packages/view360/karma.conf.js b/packages/view360/test/unit/karma.conf.js → packages/view360/karma.conf.js
@@ -18,26 +18,26 @@ module.exports = config => {
       }
     },
     files: [
-      "./setup.ts",
-      "./test-utils.ts",
-      "./specs/**/*.spec.ts",
-      "./!(node_modules)/**/*.ts",
-      "../../src/**/*.ts",
+      "./test/unit/setup.ts",
+      "./test/unit/test-utils.ts",
+      "./test/unit/specs/**/*.spec.ts",
+      "./test/unit/**/*.ts",
+      "./src/**/*.ts",
       {
-        pattern: "./pano/**/*.*",
+        pattern: "./test/unit/pano/**/*.*",
         watched: false,
         included: false,
         served: true
       }
     ],
     preprocessors: {
-      "../../**/*.ts": ["karma-typescript"]
+      "./**/*.ts": ["karma-typescript"]
     },
     proxies: {
-      "/pano/": "/base/pano/"
+      "/pano/": "/base/test/unit/pano/"
     },
     karmaTypescriptConfig: {
-      tsconfig: "./tsconfig.json",
+      tsconfig: "./test/unit/tsconfig.json",
       reports: {
         lcovonly: {
           "directory": "coverage",

diff --git a/packages/view360/test/unit/mocha.opts → packages/view360/mocha.opts b/packages/view360/test/unit/mocha.opts → packages/view360/mocha.opts
diff --git a/packages/view360/package.json b/packages/view360/package.json
@@ -34,7 +34,10 @@
 		"demo:copy-lib": "run-s demo:copy-lib-version demo:copy-lib-latest",
 		"demo:copy-lib-version": "cpx 'dist/**/*' ../../demo/static/release/$npm_package_version --clean && cpx 'css/**/*' ../../demo/static/release/$npm_package_version/css --clean && cpx 'sass/**/*' ../../demo/static/release/$npm_package_version/sass --clean",
 		"demo:copy-lib-latest": "cpx 'dist/**/*' ../../demo/static/release/latest --clean && cpx 'css/**/*' ../../demo/static/release/latest/css --clean && cpx 'sass/**/*' ../../demo/static/release/latest/sass --clean",
-		"test": "npm run test --prefix test/unit"
+		"test": "karma start",
+		"test:watch": "karma start --no-single-run",
+		"test:chrome": "karma start --chrome",
+		"coverage": "karma start --coverage && print-coveralls --sort=desc"
 	},
 	"repository": {
 		"type": "git",
@@ -77,12 +80,28 @@
 		"gl-matrix": "^3.4.3"
 	},
 	"devDependencies": {
+		"@types/chai": "^4.3.4",
+		"@types/karma-chai": "^0.1.2",
+		"@types/mocha": "^9.0.0",
+		"@types/node": "^16.11.6",
+		"@types/sinon": "^10.0.6",
 		"autoprefixer": "^9.8.5",
+		"chai": "^4.3.7",
 		"fs-extra": "^7.0.0",
+		"karma": "^3.1.4",
+		"karma-chai": "^0.1.0",
+		"karma-chrome-launcher": "^2.2.0",
+		"karma-mocha": "^1.3.0",
+		"karma-mocha-reporter": "^2.2.5",
+		"karma-sinon": "^1.0.5",
+		"karma-typescript": "^5.5.2",
+		"karma-viewport": "^1.0.8",
+		"mocha": "^9.1.3",
 		"node-sass": "^7.0.0",
 		"postcss-clean": "^1.2.2",
 		"postcss-cli": "^7.1.1",
-		"print-sizes": "0.0.3"
+		"print-sizes": "0.0.3",
+		"sinon": "^11.1.2"
 	},
 	"lernaHelperReleaseType": "prerelease",
 	"lernaHelperPublishTag": "next"