SAK-51196 webcomponents Run tests on maven build

https://sakaiproject.atlassian.net/browse/SAK-51196

Author: adrianfish

Diff for: rubrics/api/src/main/bundle/rubrics.properties

@@ -90,7 +90,6 @@ existing student rubric scores to the default point value for selected ratings.
 public_rubrics_title=Publicly Shared Rubrics
 public_rubrics_info=Rubrics in this section were created by instructors and shared publicly with all users. You can share a rubric publicly by clicking on the "Globe" icon next to the rubric you would like to share. To use one of these rubrics in your course site, expand the "Public Rubrics" section and click on the "Copy" icon located in the "Actions" column.
 
-# Rubrics in pdf
 export_title=Export {}
 export_rubric_title=Exported Rubric Title: {0}
 export_rubric_student=Student Name: {0}

Diff for: webcomponents/bundle/src/main/bundle/tasks.properties

@@ -1,3 +1,4 @@
+filter_label=Filter your tasks
 filter_current=All Current
 filter_priority_5=Priority: 5
 filter_priority_4=Priority: 4
@@ -10,6 +11,7 @@ priority_2_tooltip=Quite low (2) priority
 priority_3_tooltip=Medium (3) priority
 priority_4_tooltip=Quite high (4) priority
 priority_5_tooltip=High (5) priority
+sort_label=Sort your tasks
 sort_none=Sort
 sort_due_latest_first=Due: Latest First
 sort_due_earliest_first=Due: Earliest First

Diff for: webcomponents/tool/pom.xml

@@ -13,41 +13,6 @@
     <artifactId>webcomponents</artifactId>
     <packaging>war</packaging>
 
-    <dependencies>
-        <!--dependency>
-            <groupId>org.sakaiproject.kernel</groupId>
-            <artifactId>sakai-kernel-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sakaiproject.kernel</groupId>
-            <artifactId>sakai-component-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sakaiproject.kernel</groupId>
-            <artifactId>sakai-kernel-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sakaiproject.entitybroker</groupId>
-            <artifactId>entitybroker-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sakaiproject.entitybroker</groupId>
-            <artifactId>entitybroker-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency-->
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -141,6 +106,15 @@
                             <arguments>ci --no-fund</arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>test</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run test</arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>lint</id>
                         <goals>

Diff for: webcomponents/tool/src/main/frontend/package.json

@@ -10,7 +10,9 @@
     "lint": "eslint \"packages/**/src/*.js\" --max-warnings=0",
     "bundle": "esbuild \"bundle-entry-points/*.js\" --sourcemap --preserve-symlinks --bundle --splitting --format=esm --outdir=bundles --minify",
     "analyze-bundle": "esbuild \"bundle-entry-points/*.js\" --preserve-symlinks --splitting --bundle --metafile=meta.json --format=esm --outdir=bundles --minify",
-    "analyze": "lit-analyzer --strict --quiet --rules.no-complex-attribute-binding=warning --rules.no-incompatible-type-binding=off \"packages/**/src/*.js\""
+    "analyze": "lit-analyzer --strict --quiet --rules.no-complex-attribute-binding=warning --rules.no-incompatible-type-binding=off \"packages/**/src/*.js\"",
+    "test": "lerna run test --concurrency 1 --since origin/master --stream",
+    "test-diff": "lerna run test --concurrency 1 --since HEAD --stream"
   },
   "keywords": [],
   "author": "",
@@ -28,7 +30,7 @@
     "@sakai-ui/sakai-dialog-content": "file:packages/sakai-dialog-content",
     "@sakai-ui/sakai-document-viewer": "file:packages/sakai-document-viewer",
     "@sakai-ui/sakai-editor": "file:packages/sakai-editor",
-    "@sakai-ui/sakai-file-list": "file:packages/sakai-file-list",
+    "@sakai-ui/sakai-element": "file:packages/sakai-element",
     "@sakai-ui/sakai-grader": "file:packages/sakai-grader",
     "@sakai-ui/sakai-grades": "file:packages/sakai-grades",
     "@sakai-ui/sakai-group-picker": "file:packages/sakai-group-picker",
@@ -58,15 +60,12 @@
     "fetch-mock": "^9.11.0",
     "globals": "^15.11.0",
     "imagesloaded": "^5.0.0",
+    "lerna": "^8.1.9",
     "lint-staged": "^15.2.10",
+    "lit": "^3.2.1",
     "lit-analyzer": "^2.0.3",
     "sinon": "^19.0.2",
     "sortablejs": "^1.15.3",
     "temporal-polyfill": "0.2.5"
-  },
-  "dependencies": {
-    "@sakai-ui/sakai-element": "^3.0.6",
-    "lerna": "^8.1.9",
-    "lit": "^3.2.1"
   }
 }

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-announcements/test/sakai-announcements.test.js

@@ -11,7 +11,7 @@ import {
   INSTRUCTOR_ORDER,
 } from "../src/sakai-announcements-constants.js";
 import * as sitePickerData from "../../sakai-site-picker/test/data.js";
-import { elementUpdated, expect, fixture, waitUntil, aTimeout } from "@open-wc/testing";
+import { elementUpdated, expect, fixture } from "@open-wc/testing";
 import fetchMock from "fetch-mock/esm/client";
 
 describe("sakai-announcements tests", () => {
@@ -28,14 +28,14 @@ describe("sakai-announcements tests", () => {
   it ("renders in user mode correctly", async () => {
 
     // In user mode, we'd expect to get announcements from multiple sites.
-    let el = await fixture(html`
+    const el = await fixture(html`
       <sakai-announcements user-id="${data.userId}"></sakai-announcements>
     `);
 
-    await waitUntil(() => el.dataPage);
-
     await elementUpdated(el);
 
+    await expect(el).to.be.accessible();
+
     expect(el.shadowRoot.querySelectorAll("div.title").length).to.equal(3);
 
     expect(el.shadowRoot.querySelectorAll(".header").length).to.equal(3);
@@ -83,31 +83,21 @@ describe("sakai-announcements tests", () => {
     siteSelect.dispatchEvent(new CustomEvent("sites-selected", { detail: { value: data.vavavoom }, bubbles: true }));
     await elementUpdated(el);
     expect(el.shadowRoot.querySelectorAll("div.title").length).to.equal(1);
+
+    await expect(el).to.be.accessible();
   });
 
   it ("renders in site mode correctly", async () => {
 
-    let el = await fixture(html`
+    const el = await fixture(html`
       <sakai-announcements site-id="${data.siteId}"></sakai-announcements>
     `);
 
-    await waitUntil(() => el.dataPage);
     await elementUpdated(el);
 
-    expect(el.shadowRoot.querySelectorAll(".title").length).to.equal(2);
+    await expect(el).to.be.accessible();
 
+    expect(el.shadowRoot.querySelectorAll(".title").length).to.equal(2);
     expect(el.shadowRoot.querySelectorAll(".header").length).to.equal(2);
   });
-
-  it ("is accessible", async () => {
-
-    let el = await fixture(html`
-      <sakai-announcements user-id="${data.userId}"></sakai-announcements>
-    `);
-
-    await waitUntil(() => el.dataPage);
-    await elementUpdated(el);
-
-    expect(el.shadowRoot).to.be.accessible();
-  });
 });

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-announcements/web-test-runner.config.mjs

@@ -1,17 +1,12 @@
-// import { playwrightLauncher } from '@web/test-runner-playwright';
+const filteredLogs = ['Lit is in dev mode. Not recommended for production! See https://lit.dev/msg/dev-mode for more information.'];
 
-const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
+export default ({
 
-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'],
-  },
+  nodeResolve: true,
 
   /** Filter out lit dev mode logs */
   filterBrowserLogs(log) {
@@ -22,22 +17,4 @@ export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
     }
     return true;
   },
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto',
-
-  /** Amount of browsers to run concurrently */
-  // concurrentBrowsers: 2,
-
-  /** Amount of test files per browser to test concurrently */
-  // concurrency: 1,
-
-  /** Browsers to run tests on */
-  // browsers: [
-  //   playwrightLauncher({ product: 'chromium' }),
-  //   playwrightLauncher({ product: 'firefox' }),
-  //   playwrightLauncher({ product: 'webkit' }),
-  // ],
-
-  // See documentation for all available options
 });

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-button/src/SakaiButton.js

@@ -1,5 +1,6 @@
 import { SakaiShadowElement } from "@sakai-ui/sakai-element";
 import { css, html } from "lit";
+import { ifDefined } from "lit/directives/if-defined.js";
 
 export class SakaiButton extends SakaiShadowElement {
 
@@ -27,6 +28,7 @@ export class SakaiButton extends SakaiShadowElement {
       <button
         class="${this.primary ? "primary" : ""} ${this.type ? this.type : ""}"
         @click=${this.clicked}
+        title="${ifDefined(this.title)}"
       >
         <slot>
         </slot>

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-button/test/sakai-button.test.js

@@ -1,20 +1,29 @@
 import "../sakai-button.js";
-import { expect, fixture, waitUntil } from "@open-wc/testing";
+import { elementUpdated, expect, fixture, waitUntil } from "@open-wc/testing";
 import { html } from "lit";
 
 describe("sakai-button tests", () => {
 
-  it ("renders correctly", async () => {
+  it ("renders correctly with text content", async () => {
 
-    const el = await fixture(html`<sakai-button primary>Eggs</sakai-button>`);
+    const el = await fixture(html`<sakai-button title="eggs button" primary>Eggs</sakai-button>`);
+
+    await elementUpdated(el);
+
+    await expect(el).to.be.accessible();
 
     expect(el.shadowRoot.querySelector("button").classList.contains("primary")).to.be.true;
   });
 
-  it ("is accessible", async () => {
+  it ("renders correctly with no text", async () => {
+ 
+    const title = "No text button";
+    const el = await fixture(html`<sakai-button title="${title}"></sakai-button>`);
 
-    const el = await fixture(html`<sakai-button>Eggs</sakai-button>`);
+    await elementUpdated(el);
 
     await expect(el).to.be.accessible();
+
+    expect(el.shadowRoot.querySelector("button").getAttribute("title")).to.equal(title);
   });
 });

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-button/web-test-runner.config.mjs

@@ -1,17 +1,12 @@
-// import { playwrightLauncher } from '@web/test-runner-playwright';
+const filteredLogs = ['Lit is in dev mode. Not recommended for production! See https://lit.dev/msg/dev-mode for more information.'];
 
-const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
+export default ({
 
-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'],
-  },
+  nodeResolve: true,
 
   /** Filter out lit dev mode logs */
   filterBrowserLogs(log) {
@@ -22,22 +17,4 @@ export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
     }
     return true;
   },
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto',
-
-  /** Amount of browsers to run concurrently */
-  // concurrentBrowsers: 2,
-
-  /** Amount of test files per browser to test concurrently */
-  // concurrency: 1,
-
-  /** Browsers to run tests on */
-  // browsers: [
-  //   playwrightLauncher({ product: 'chromium' }),
-  //   playwrightLauncher({ product: 'firefox' }),
-  //   playwrightLauncher({ product: 'webkit' }),
-  // ],
-
-  // See documentation for all available options
 });

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-calendar/test/sakai-calendar.test.js

@@ -2,7 +2,7 @@ import "../sakai-calendar.js";
 import { html } from "lit";
 import * as data from "./data.js";
 import * as sitePickerData from "../../sakai-site-picker/test/data.js";
-import { expect, fixture, waitUntil, aTimeout } from "@open-wc/testing";
+import { elementUpdated, expect, fixture, waitUntil } from "@open-wc/testing";
 import fetchMock from "fetch-mock/esm/client";
 
 describe("sakai-calendar tests", () => {
@@ -26,21 +26,16 @@ describe("sakai-calendar tests", () => {
 
     waitUntil(() => el.events);
 
+    await elementUpdated(el);
+    await expect(el).to.be.accessible();
+
     el.dispatchEvent(new CustomEvent("user-selected-date-changed", { detail: { selectedDate: data.selectedDate } }));
 
-    await el.updateComplete;
+    await elementUpdated(el);
+    await expect(el).to.be.accessible();
 
     expect(el.shadowRoot.querySelector("#days-events a")).to.exist;
     expect(el.shadowRoot.querySelectorAll("#days-events a span").item(0).innerHTML).to.contain(data.userCalendarEvents.events[0].title);
     expect(el.shadowRoot.querySelectorAll("#days-events a span").item(1).innerHTML).to.contain(data.userCalendarEvents.events[0].siteTitle);
   });
-
-  it ("is accessible", async () => {
-
-    let el = await fixture(html`
-      <sakai-calendar user-id="${data.userId}"></sakai-calendar>
-    `);
-
-    expect(el.shadowRoot).to.be.accessible();
-  });
 });

Diff for: webcomponents/tool/src/main/frontend/packages/sakai-calendar/web-test-runner.config.mjs

@@ -1,17 +1,12 @@
-// import { playwrightLauncher } from '@web/test-runner-playwright';
+const filteredLogs = ['Lit is in dev mode. Not recommended for production! See https://lit.dev/msg/dev-mode for more information.'];
 
-const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
+export default ({
 
-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'],
-  },
+  nodeResolve: true,
 
   /** Filter out lit dev mode logs */
   filterBrowserLogs(log) {
@@ -22,22 +17,4 @@ export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
     }
     return true;
   },
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto',
-
-  /** Amount of browsers to run concurrently */
-  // concurrentBrowsers: 2,
-
-  /** Amount of test files per browser to test concurrently */
-  // concurrency: 1,
-
-  /** Browsers to run tests on */
-  // browsers: [
-  //   playwrightLauncher({ product: 'chromium' }),
-  //   playwrightLauncher({ product: 'firefox' }),
-  //   playwrightLauncher({ product: 'webkit' }),
-  // ],
-
-  // See documentation for all available options
 });