Fixed the test and the lint-staged command

sakaiproject · Mar 21, 2024 · cdfb529 · cdfb529
1 parent 1b0fe65
commit cdfb529
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/serviceworker/pom.xml b/serviceworker/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sakaiproject</groupId>
     <artifactId>master</artifactId>
-    <version>24-SNAPSHOT</version>
+    <version>25-SNAPSHOT</version>
     <relativePath>../master/pom.xml</relativePath>
   </parent>
 

diff --git a/webcomponents/tool/src/main/frontend/package-lock.json b/webcomponents/tool/src/main/frontend/package-lock.json
diff --git a/webcomponents/tool/src/main/frontend/package.json b/webcomponents/tool/src/main/frontend/package.json
@@ -14,8 +14,8 @@
   },
   "lint-staged": {
     "**/packages/**/src/*.js": [
-      "eslint --fix",
-      "lit-analyzer --rules.no-incompatible-type-binding off --rules.no-nullable-attribute-binding off"
+      "npx eslint --fix",
+      "npx lit-analyzer --rules.no-incompatible-type-binding off --rules.no-nullable-attribute-binding off"
     ]
   },
   "keywords": [],

diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/package.json b/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/package.json
@@ -35,6 +35,7 @@
     "fetch-mock": "^9.11.0"
   },
   "dependencies": {
+    "@sakai-ui/sakai-portal-utils": "file:../sakai-portal-utils",
     "get-browser-fingerprint": "^3.2.0",
     "lit": "^3.1.0"
   }

diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/src/sakai-push-utils.js b/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/src/sakai-push-utils.js
@@ -105,7 +105,7 @@ const setupServiceWorkerListener = () => {
   navigator.serviceWorker.addEventListener("message", serviceWorkerMessageListener);
 };
 
-export const checkUserChangedThenSet = userId => {
+const checkUserChangedThenSet = userId => {
 
   if (!userId) return false;
 

diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/test/sakai-push-utils.test.js b/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/test/sakai-push-utils.test.js
@@ -1,18 +1,8 @@
-import { setup } from '../src/sakai-push-utils.js';
-//import { expect } from '@open-wc/testing';
-//import fetchMock from "fetch-mock/esm/client";
+import { pushSetupComplete } from '../src/sakai-push-utils.js';
 
 describe("sakai-push-utils tests", () => {
 
-  window.top.portal = { locale: 'en_GB' };
-
-  /*
-  fetchMock
-    .get(data.i18nUrl, data.i18n, { overwriteRoutes: true })
-    .get("*", 500, { overwriteRoutes: true });
-    */
-
   it ("sets up uccessfully", async () => {
-    setup.then(() => console.log("setup complete"));
+    pushSetupComplete.then(() => console.log("push setup complete"));
   });
 });
diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/web-test-runner.config.mjs b/webcomponents/tool/src/main/frontend/packages/sakai-push-utils/web-test-runner.config.mjs
@@ -4,6 +4,8 @@ export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
   /** Test files to run */
   files: 'test/**/*.test.js',
 
+  rootDir: '../../',
+
   /** Resolve bare module imports */
   nodeResolve: {
     exportConditions: ['browser', 'development'],