web: eslint & prettier fixes, plus small aesthetic differences.

This commit is contained in:
Ken Sternberg 2023-10-04 14:24:45 -07:00
parent 3592aae3df
commit 1d0519ea58
12 changed files with 41 additions and 60 deletions

View file

@ -4,7 +4,6 @@ import { browser } from "@wdio/globals";
const CLICK_TIME_DELAY = 250; const CLICK_TIME_DELAY = 250;
export default class AdminPage extends Page { export default class AdminPage extends Page {
public get pageHeader() { public get pageHeader() {
return $('>>>ak-page-header slot[name="header"]'); return $('>>>ak-page-header slot[name="header"]');
} }

View file

@ -1,12 +1,12 @@
import AdminPage from "./admin.page.js"; import AdminPage from "./admin.page.js";
import ApplicationForm from "./forms/application.form.js"; import ApplicationForm from "./forms/application.form.js";
import ForwardProxyForm from "./forms/forward-proxy.form.js";
import LdapForm from "./forms/ldap.form.js"; import LdapForm from "./forms/ldap.form.js";
import OauthForm from "./forms/oauth.form.js"; import OauthForm from "./forms/oauth.form.js";
import TransparentProxyForm from "./forms/transparent-proxy.form.js"; import RadiusForm from "./forms/radius.form.js";
import ForwardProxyForm from "./forms/forward-proxy.form.js";
import SamlForm from "./forms/saml.form.js"; import SamlForm from "./forms/saml.form.js";
import ScimForm from "./forms/scim.form.js"; import ScimForm from "./forms/scim.form.js";
import RadiusForm from "./forms/radius.form.js"; import TransparentProxyForm from "./forms/transparent-proxy.form.js";
import { $ } from "@wdio/globals"; import { $ } from "@wdio/globals";
/** /**
@ -44,7 +44,7 @@ class ApplicationWizardView extends AdminPage {
} }
get successMessage() { get successMessage() {
return $('>>>[data-commit-state="success"]') return $('>>>[data-commit-state="success"]');
} }
} }

View file

@ -1,5 +1,5 @@
import { $ } from "@wdio/globals";
import Page from "../page.js"; import Page from "../page.js";
import { $ } from "@wdio/globals";
export class ApplicationForm extends Page { export class ApplicationForm extends Page {
get name() { get name() {

View file

@ -1,12 +1,12 @@
import { $ } from "@wdio/globals";
import Page from "../page.js"; import Page from "../page.js";
import { $ } from "@wdio/globals";
export class ForwardProxyForm extends Page { export class ForwardProxyForm extends Page {
async setAuthorizationFlow(selector: string) { async setAuthorizationFlow(selector: string) {
await this.searchSelect( await this.searchSelect(
'>>>ak-flow-search[name="authorizationFlow"] input[type="text"]', '>>>ak-flow-search[name="authorizationFlow"] input[type="text"]',
"authorizationFlow", "authorizationFlow",
`button*=${selector}` `button*=${selector}`,
); );
} }

View file

@ -5,7 +5,7 @@ export class LdapForm extends Page {
await this.searchSelect( await this.searchSelect(
'>>>ak-tenanted-flow-search[name="authorizationFlow"] input[type="text"]', '>>>ak-tenanted-flow-search[name="authorizationFlow"] input[type="text"]',
"authorizationFlow", "authorizationFlow",
`button*=${selector}` `button*=${selector}`,
); );
} }
} }

View file

@ -5,7 +5,7 @@ export class RadiusForm extends Page {
await this.searchSelect( await this.searchSelect(
'>>>ak-tenanted-flow-search[name="authorizationFlow"] input[type="text"]', '>>>ak-tenanted-flow-search[name="authorizationFlow"] input[type="text"]',
"authorizationFlow", "authorizationFlow",
`button*=${selector}` `button*=${selector}`,
); );
} }
} }

View file

@ -1,12 +1,12 @@
import { $ } from "@wdio/globals";
import Page from "../page.js"; import Page from "../page.js";
import { $ } from "@wdio/globals";
export class SamlForm extends Page { export class SamlForm extends Page {
async setAuthorizationFlow(selector: string) { async setAuthorizationFlow(selector: string) {
await this.searchSelect( await this.searchSelect(
'>>>ak-flow-search[name="authorizationFlow"] input[type="text"]', '>>>ak-flow-search[name="authorizationFlow"] input[type="text"]',
"authorizationFlow", "authorizationFlow",
`button*=${selector}` `button*=${selector}`,
); );
} }

View file

@ -1,7 +1,6 @@
import Page from "../page.js"; import Page from "../page.js";
export class ScimForm extends Page { export class ScimForm extends Page {
get url() { get url() {
return $('>>>input[name="url"]'); return $('>>>input[name="url"]');
} }

View file

@ -1,12 +1,12 @@
import { $ } from "@wdio/globals";
import Page from "../page.js"; import Page from "../page.js";
import { $ } from "@wdio/globals";
export class TransparentProxyForm extends Page { export class TransparentProxyForm extends Page {
async setAuthorizationFlow(selector: string) { async setAuthorizationFlow(selector: string) {
await this.searchSelect( await this.searchSelect(
'>>>ak-flow-search[name="authorizationFlow"] input[type="text"]', '>>>ak-flow-search[name="authorizationFlow"] input[type="text"]',
"authorizationFlow", "authorizationFlow",
`button*=${selector}` `button*=${selector}`,
); );
} }

View file

@ -4,41 +4,34 @@ import { randomId } from "../utils/index.js";
import { login } from "../utils/login.js"; import { login } from "../utils/login.js";
import { expect } from "@wdio/globals"; import { expect } from "@wdio/globals";
async function reachTheProvider(title: string) { async function reachTheProvider(title: string) {
const newPrefix = randomId(); const newPrefix = randomId();
await ApplicationsListPage.logout(); await ApplicationsListPage.logout();
await login(); await login();
await ApplicationsListPage.open(); await ApplicationsListPage.open();
await expect(await ApplicationsListPage.pageHeader).toHaveText("Applications"); await expect(await ApplicationsListPage.pageHeader).toHaveText("Applications");
await ApplicationsListPage.startWizardButton.click(); await ApplicationsListPage.startWizardButton.click();
await ApplicationWizardView.wizardTitle.waitForDisplayed(); await ApplicationWizardView.wizardTitle.waitForDisplayed();
await expect(await ApplicationWizardView.wizardTitle).toHaveText("New application"); await expect(await ApplicationWizardView.wizardTitle).toHaveText("New application");
await ApplicationWizardView.app.name.setValue(`${title} - ${newPrefix}`); await ApplicationWizardView.app.name.setValue(`${title} - ${newPrefix}`);
await ApplicationWizardView.app.uiSettings.scrollIntoView(); await ApplicationWizardView.app.uiSettings.scrollIntoView();
await ApplicationWizardView.app.uiSettings.click(); await ApplicationWizardView.app.uiSettings.click();
await ApplicationWizardView.app.launchUrl.scrollIntoView(); await ApplicationWizardView.app.launchUrl.scrollIntoView();
await ApplicationWizardView.app.launchUrl.setValue('http://example.goauthentik.io'); await ApplicationWizardView.app.launchUrl.setValue("http://example.goauthentik.io");
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
return await ApplicationWizardView.pause(); return await ApplicationWizardView.pause();
} }
async function getCommitMessage() { async function getCommitMessage() {
await ApplicationWizardView.successMessage.waitForDisplayed(); await ApplicationWizardView.successMessage.waitForDisplayed();
return await ApplicationWizardView.successMessage; return await ApplicationWizardView.successMessage;
} }
describe("Configure Applications with the Application Wizard", () => { describe("Configure Applications with the Application Wizard", () => {
it("Should configure a simple LDAP Application", async () => { it("Should configure a simple LDAP Application", async () => {
await reachTheProvider("New LDAP Application"); await reachTheProvider("New LDAP Application");
@ -53,9 +46,7 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple Oauth2 Application", async () => { it("Should configure a simple Oauth2 Application", async () => {
@ -69,14 +60,12 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await ApplicationWizardView.oauth.setAuthorizationFlow( await ApplicationWizardView.oauth.setAuthorizationFlow(
"default-provider-authorization-explicit-consent" "default-provider-authorization-explicit-consent",
); );
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple SAML Application", async () => { it("Should configure a simple SAML Application", async () => {
@ -90,15 +79,13 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await ApplicationWizardView.saml.setAuthorizationFlow( await ApplicationWizardView.saml.setAuthorizationFlow(
"default-provider-authorization-explicit-consent" "default-provider-authorization-explicit-consent",
); );
await ApplicationWizardView.saml.acsUrl.setValue("http://example.com:8000/"); await ApplicationWizardView.saml.acsUrl.setValue("http://example.com:8000/");
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple SCIM Application", async () => { it("Should configure a simple SCIM Application", async () => {
@ -116,9 +103,7 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple Radius Application", async () => { it("Should configure a simple Radius Application", async () => {
@ -131,15 +116,11 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await ApplicationWizardView.radius.setAuthenticationFlow( await ApplicationWizardView.radius.setAuthenticationFlow("default-authentication-flow");
"default-authentication-flow"
);
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple Transparent Proxy Application", async () => { it("Should configure a simple Transparent Proxy Application", async () => {
@ -152,17 +133,19 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await ApplicationWizardView.transparentProxy.setAuthorizationFlow( await ApplicationWizardView.transparentProxy.setAuthorizationFlow(
"default-provider-authorization-explicit-consent" "default-provider-authorization-explicit-consent",
);
await ApplicationWizardView.transparentProxy.externalHost.setValue(
"http://external.example.com",
);
await ApplicationWizardView.transparentProxy.internalHost.setValue(
"http://internal.example.com",
); );
await ApplicationWizardView.transparentProxy.externalHost.setValue("http://external.example.com");
await ApplicationWizardView.transparentProxy.internalHost.setValue("http://internal.example.com");
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
it("Should configure a simple Forward Proxy Application", async () => { it("Should configure a simple Forward Proxy Application", async () => {
@ -175,15 +158,15 @@ describe("Configure Applications with the Application Wizard", () => {
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await ApplicationWizardView.forwardProxy.setAuthorizationFlow( await ApplicationWizardView.forwardProxy.setAuthorizationFlow(
"default-provider-authorization-explicit-consent" "default-provider-authorization-explicit-consent",
);
await ApplicationWizardView.forwardProxy.externalHost.setValue(
"http://external.example.com",
); );
await ApplicationWizardView.forwardProxy.externalHost.setValue("http://external.example.com");
await ApplicationWizardView.nextButton.click(); await ApplicationWizardView.nextButton.click();
await ApplicationWizardView.pause(); await ApplicationWizardView.pause();
await expect(getCommitMessage()).toHaveText( await expect(getCommitMessage()).toHaveText("Your application has been saved");
"Your application has been saved"
);
}); });
}); });

View file

@ -209,8 +209,7 @@ export const config: Options.Testrunner = {
* @param {Array.<String>} specs List of spec file paths that are to be run * @param {Array.<String>} specs List of spec file paths that are to be run
* @param {object} browser instance of created browser/device session * @param {object} browser instance of created browser/device session
*/ */
before: function (capabilities, specs) { before: function (capabilities, specs) {},
},
/** /**
* Runs before a WebdriverIO command gets executed. * Runs before a WebdriverIO command gets executed.
* @param {string} commandName hook command name * @param {string} commandName hook command name

View file

@ -101,6 +101,7 @@ export class AkSlugInput extends AKElement {
// iteration are *similar enough*, set the input value. "Similar enough" here is defined as // iteration are *similar enough*, set the input value. "Similar enough" here is defined as
// "any event which adds or removes a character but leaves the rest of the slug looking like // "any event which adds or removes a character but leaves the rest of the slug looking like
// the previous iteration, set it to the current iteration." // the previous iteration, set it to the current iteration."
const newSlug = convertToSlug(ev.target.value); const newSlug = convertToSlug(ev.target.value);
const oldSlug = this.input.value; const oldSlug = this.input.value;
const [shorter, longer] = const [shorter, longer] =