Merge branch 'web/element/ak-select-table' into web/policy-wizard-3

* web/element/ak-select-table: Prettier had opinions web: small fixes for elements and forms web: not sure where all these getElement() additions come from; did I add them? Anyway, they were breaking the tests, they're a Wdio9-ism. web: rollback dependabot "upgrade" that broke testing web: update api-less tables
goauthentik · Sep 27, 2024 · 59f884b · 59f884b
2 parents 1bcecb2 + 9e1731d
commit 59f884b
Show file tree

Hide file tree

Showing 10 changed files with 287 additions and 234 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -71,6 +71,7 @@
         "@types/eslint__js": "^8.42.3",
         "@types/grecaptcha": "^3.0.9",
         "@types/guacamole-common-js": "1.5.2",
+        "@types/mocha": "^10.0.8",
         "@types/node": "^22.7.3",
         "@types/showdown": "^2.0.6",
         "@typescript-eslint/eslint-plugin": "^8.7.0",

diff --git a/web/src/admin/enterprise/EnterpriseStatusCard.test.ts b/web/src/admin/enterprise/EnterpriseStatusCard.test.ts
@@ -1,14 +1,14 @@
-import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet.js";
 import { $, expect } from "@wdio/globals";
 
 import { msg } from "@lit/localize";
 import { TemplateResult, html, render as litRender } from "lit";
 
-import AKGlobal from "@goauthentik/common/styles/authentik.css";
+import AKGlobal from "../../common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import { LicenseForecast, LicenseSummary, LicenseSummaryStatusEnum } from "@goauthentik/api";
 
+import { ensureCSSStyleSheet } from "../../elements/utils/ensureCSSStyleSheet.js";
 import "./EnterpriseStatusCard.js";
 
 const render = (body: TemplateResult) => {

diff --git a/web/src/elements/EmptyState.test.ts b/web/src/elements/EmptyState.test.ts
@@ -1,13 +1,13 @@
-import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet.js";
 import { $, expect } from "@wdio/globals";
 
 import { msg } from "@lit/localize";
 import { TemplateResult, html, render as litRender } from "lit";
 
-import AKGlobal from "@goauthentik/common/styles/authentik.css";
+import AKGlobal from "../common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import "./EmptyState.js";
+import { ensureCSSStyleSheet } from "./utils/ensureCSSStyleSheet.js";
 
 const render = (body: TemplateResult) => {
     document.adoptedStyleSheets = [

diff --git a/web/src/elements/ak-table/tests/ak-select-table.test.ts b/web/src/elements/ak-table/tests/ak-select-table.test.ts
@@ -89,7 +89,7 @@ describe("Multiselect Table", () => {
     });
 
     it("it should render the select-all control", async () => {
-        const selall = await table.$("thead").$$("tr")[0].$$("th")[0];
+        const selall = await table.$("thead").$$("tr")[0].$$("td")[0];
         if (selall === undefined) {
             throw new Error("Could not find table header");
         }
@@ -104,7 +104,7 @@ describe("Multiselect Table", () => {
     });
 
     it("it should select all when that control is clicked", async () => {
-        const selall = await table.$("thead").$$("tr")[0].$$("th")[0];
+        const selall = await table.$("thead").$$("tr")[0].$$("td")[0];
         if (selall === undefined) {
             throw new Error("Could not find table header");
         }
@@ -117,7 +117,7 @@ describe("Multiselect Table", () => {
     });
 
     it("it should clear all when that control is clicked twice", async () => {
-        const selall = await table.$("thead").$$("tr")[0].$$("th")[0];
+        const selall = await table.$("thead").$$("tr")[0].$$("td")[0];
         if (selall === undefined) {
             throw new Error("Could not find table header");
         }

diff --git a/web/src/elements/cards/tests/AggregateCard.test.ts b/web/src/elements/cards/tests/AggregateCard.test.ts
@@ -1,11 +1,11 @@
-import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet.js";
 import { $, expect } from "@wdio/globals";
 
 import { TemplateResult, html, render as litRender } from "lit";
 
-import AKGlobal from "@goauthentik/common/styles/authentik.css";
+import AKGlobal from "../../../common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
+import { ensureCSSStyleSheet } from "../../utils/ensureCSSStyleSheet.js";
 import "../AggregateCard.js";
 
 const render = (body: TemplateResult) => {

diff --git a/web/src/elements/cards/tests/AggregatePromiseCard.test.ts b/web/src/elements/cards/tests/AggregatePromiseCard.test.ts
@@ -1,11 +1,11 @@
-import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet.js";
 import { $, expect } from "@wdio/globals";
 
 import { TemplateResult, html, render as litRender } from "lit";
 
-import AKGlobal from "@goauthentik/common/styles/authentik.css";
+import AKGlobal from "../../../common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
+import { ensureCSSStyleSheet } from "../../utils/ensureCSSStyleSheet.js";
 import "../AggregatePromiseCard.js";
 
 const render = (body: TemplateResult) => {

diff --git a/web/src/elements/cards/tests/QuickActionCard.test.ts b/web/src/elements/cards/tests/QuickActionCard.test.ts
@@ -1,11 +1,11 @@
-import { ensureCSSStyleSheet } from "@goauthentik/elements/utils/ensureCSSStyleSheet.js";
 import { $, expect } from "@wdio/globals";
 
 import { TemplateResult, html, render as litRender } from "lit";
 
-import AKGlobal from "@goauthentik/common/styles/authentik.css";
+import AKGlobal from "../../../common/styles/authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
+import { ensureCSSStyleSheet } from "../../utils/ensureCSSStyleSheet.js";
 import { QuickAction } from "../QuickActionsCard.js";
 import "../QuickActionsCard.js";
 

diff --git a/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts b/web/src/elements/forms/SearchSelect/tests/ak-search-select.test.ts
@@ -1,14 +1,14 @@
 /* eslint-env jest */
-import { AKElement } from "@goauthentik/elements/Base";
-import { bound } from "@goauthentik/elements/decorators/bound.js";
-import { CustomListenerElement } from "@goauthentik/elements/utils/eventEmitter";
 import { $, browser, expect } from "@wdio/globals";
 import { slug } from "github-slugger";
 
 import { html, render } from "lit";
 import { customElement } from "lit/decorators.js";
 import { property, query } from "lit/decorators.js";
 
+import { AKElement } from "../../../../elements/Base.js";
+import { bound } from "../../../../elements/decorators/bound.js";
+import { CustomListenerElement } from "../../../../elements/utils/eventEmitter";
 import "../ak-search-select.js";
 import { SearchSelect } from "../ak-search-select.js";
 import { type ViewSample, sampleData } from "../stories/sampleData.js";

diff --git a/web/tsconfig.base.json b/web/tsconfig.base.json
@@ -6,7 +6,13 @@
         "paths": {
             "@goauthentik/docs/*": ["../website/docs/*"]
         },
-        "types": ["@wdio/types", "grecaptcha"],
+        "types": [
+            "node",
+            "@wdio/mocha-framework",
+            "@wdio/types",
+            "expect-webdriverio",
+            "grecaptcha"
+        ],
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
         "experimentalDecorators": true,
@@ -58,5 +64,6 @@
                 }
             }
         ]
-    }
+    },
+    "exclude": ["src/**/*.test.ts"]
 }