mirror of
https://github.com/maputnik/editor.git
synced 2025-12-06 06:10:00 +00:00
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.3 to 5.9.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/microsoft/TypeScript/releases">typescript's releases</a>.</em></p> <blockquote> <h2>TypeScript 5.9</h2> <p>Release notes pending.</p> <!-- raw HTML omitted --> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> <li>[[No specific changes for TypeScript 5.9.2 (Stable)]]</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 RC</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-rc/">release announcement</a></p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 Beta</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-beta/">release announcement</a>.</p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="be86783155"><code>be86783</code></a> Give more specific errors for <code>verbatimModuleSyntax</code> (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62113">#62113</a>)</li> <li><a href="22ef57786f"><code>22ef577</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250714...</li> <li><a href="d5a414cd1d"><code>d5a414c</code></a> Don't use <code>noErrorTruncation</code> when printing types with <code>maximumLength</code> set (#...</li> <li><a href="f14b5c8a2f"><code>f14b5c8</code></a> Remove unused and confusing dom.iterable.d.ts file (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62037">#62037</a>)</li> <li><a href="2778e84ed8"><code>2778e84</code></a> Restore AbortSignal.abort (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62086">#62086</a>)</li> <li><a href="65cb4bd2d5"><code>65cb4bd</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250710...</li> <li><a href="9e20e032ef"><code>9e20e03</code></a> Clear out checker-level stacks on pop (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62016">#62016</a>)</li> <li><a href="87740bc7fe"><code>87740bc</code></a> Fix for Issue 61081 (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61221">#61221</a>)</li> <li><a href="833a8d492c"><code>833a8d4</code></a> Fix Symbol completion priority and cursor positioning (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61945">#61945</a>)</li> <li><a href="0018c9ff12"><code>0018c9f</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250702...</li> <li>Additional commits viewable in <a href="https://github.com/microsoft/TypeScript/compare/v5.8.3...v5.9.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Harel M <harel.mazor@gmail.com>
221 lines
6.8 KiB
TypeScript
221 lines
6.8 KiB
TypeScript
/// <reference types="cypress-plugin-tab" />
|
|
|
|
import { CypressHelper } from "@shellygo/cypress-test-utils";
|
|
import { Assertable, then } from "@shellygo/cypress-test-utils/assertable";
|
|
import MaputnikCypressHelper from "./maputnik-cypress-helper";
|
|
import ModalDriver from "./modal-driver";
|
|
const baseUrl = "http://localhost:8888/";
|
|
|
|
const styleFromWindow = (win: Window) => {
|
|
const styleId = win.localStorage.getItem("maputnik:latest_style");
|
|
const styleItemKey = `maputnik:style:${styleId}`;
|
|
const styleItem = win.localStorage.getItem(styleItemKey);
|
|
if (!styleItem) throw new Error("Could not get styleItem from localStorage");
|
|
const obj = JSON.parse(styleItem);
|
|
return obj;
|
|
};
|
|
|
|
export class MaputnikAssertable<T> extends Assertable<T> {
|
|
shouldEqualToStoredStyle = () =>
|
|
then(
|
|
new CypressHelper().get.window().then((win: Window) => {
|
|
const style = styleFromWindow(win);
|
|
then(this.chainable).shouldDeepNestedInclude(style);
|
|
})
|
|
);
|
|
}
|
|
|
|
export class MaputnikDriver {
|
|
private helper = new MaputnikCypressHelper();
|
|
private modalDriver = new ModalDriver();
|
|
|
|
public beforeAndAfter = () => {
|
|
beforeEach(() => {
|
|
this.given.setupMockBackedResponses();
|
|
this.when.setStyle("both");
|
|
});
|
|
};
|
|
|
|
public then = (chainable: Cypress.Chainable<any>) =>
|
|
new MaputnikAssertable(chainable);
|
|
|
|
public given = {
|
|
...this.helper.given,
|
|
setupMockBackedResponses: () => {
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "example-style.json",
|
|
response: {
|
|
fixture: "example-style.json",
|
|
},
|
|
alias: "example-style.json",
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "example-layer-style.json",
|
|
response: {
|
|
fixture: "example-layer-style.json",
|
|
},
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "geojson-style.json",
|
|
response: {
|
|
fixture: "geojson-style.json",
|
|
},
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "raster-style.json",
|
|
response: {
|
|
fixture: "raster-style.json",
|
|
},
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "geojson-raster-style.json",
|
|
response: {
|
|
fixture: "geojson-raster-style.json",
|
|
},
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: baseUrl + "rectangles-style.json",
|
|
response: {
|
|
fixture: "rectangles-style.json",
|
|
},
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: "*example.local/*",
|
|
response: [],
|
|
});
|
|
this.helper.given.interceptAndMockResponse({
|
|
method: "GET",
|
|
url: "*example.com/*",
|
|
response: [],
|
|
});
|
|
},
|
|
};
|
|
|
|
public when = {
|
|
...this.helper.when,
|
|
modal: this.modalDriver.when,
|
|
doWithin: (selector: string, fn: () => void) => {
|
|
this.helper.when.doWithin(fn, selector);
|
|
},
|
|
tab: () => this.helper.get.element("body").tab(),
|
|
waitForExampleFileResponse: () => {
|
|
this.helper.when.waitForResponse("example-style.json");
|
|
},
|
|
chooseExampleFile: () => {
|
|
this.helper.get
|
|
.bySelector("type", "file")
|
|
.selectFile("cypress/fixtures/example-style.json", { force: true });
|
|
},
|
|
setStyle: (
|
|
styleProperties: "geojson" | "raster" | "both" | "layer" | "rectangles" | "",
|
|
zoom?: number
|
|
) => {
|
|
const url = new URL(baseUrl);
|
|
switch (styleProperties) {
|
|
case "geojson":
|
|
url.searchParams.set("style", baseUrl + "geojson-style.json");
|
|
break;
|
|
case "raster":
|
|
url.searchParams.set("style", baseUrl + "raster-style.json");
|
|
break;
|
|
case "both":
|
|
url.searchParams.set("style", baseUrl + "geojson-raster-style.json");
|
|
break;
|
|
case "layer":
|
|
url.searchParams.set("style", baseUrl + "example-layer-style.json");
|
|
break;
|
|
case "rectangles":
|
|
url.searchParams.set("style", baseUrl + "rectangles-style.json");
|
|
break;
|
|
}
|
|
|
|
if (zoom) {
|
|
url.hash = `${zoom}/41.3805/2.1635`;
|
|
}
|
|
this.helper.when.visit(url.toString());
|
|
if (styleProperties) {
|
|
this.helper.when.acceptConfirm();
|
|
}
|
|
// when methods should not include assertions
|
|
const toolbarLink = this.helper.get.elementByTestId("toolbar:link");
|
|
toolbarLink.scrollIntoView();
|
|
toolbarLink.should("be.visible");
|
|
},
|
|
|
|
typeKeys: (keys: string) => this.helper.get.element("body").type(keys),
|
|
|
|
clickZoomIn: () => {
|
|
this.helper.get.element(".maplibregl-ctrl-zoom-in").click();
|
|
},
|
|
|
|
selectWithin: (selector: string, value: string) => {
|
|
this.when.doWithin(selector, () => {
|
|
this.helper.get.element("select").select(value);
|
|
});
|
|
},
|
|
|
|
select: (selector: string, value: string) => {
|
|
this.helper.get.elementByTestId(selector).select(value);
|
|
},
|
|
|
|
focus: (selector: string) => {
|
|
this.helper.when.focus(selector);
|
|
},
|
|
|
|
setValue: (selector: string, text: string) => {
|
|
this.helper.get
|
|
.elementByTestId(selector)
|
|
.clear()
|
|
.type(text, { parseSpecialCharSequences: false });
|
|
},
|
|
|
|
setValueToPropertyArray: (selector: string, value: string) => {
|
|
this.when.doWithin(selector, () => {
|
|
this.helper.get.element(".maputnik-array-block-content input").last().type("{selectall}"+value, {force: true });
|
|
});
|
|
},
|
|
|
|
addValueToPropertyArray: (selector: string, value: string) => {
|
|
this.when.doWithin(selector, () => {
|
|
this.helper.get.element(".maputnik-array-add-value").click({ force: true });
|
|
this.helper.get.element(".maputnik-array-block-content input").last().type("{selectall}"+value, {force: true });
|
|
});
|
|
},
|
|
|
|
closePopup: () => {
|
|
this.helper.get.element(".maplibregl-popup-close-button").click();
|
|
},
|
|
|
|
collapseGroupInLayerEditor: (index = 0) => {
|
|
this.helper.get.element(".maputnik-layer-editor-group__button").eq(index).realClick();
|
|
}
|
|
};
|
|
|
|
public get = {
|
|
...this.helper.get,
|
|
isMac: () => {
|
|
return Cypress.platform === "darwin";
|
|
},
|
|
|
|
styleFromLocalStorage: () =>
|
|
this.helper.get.window().then((win) => styleFromWindow(win)),
|
|
|
|
exampleFileUrl: () => {
|
|
return baseUrl + "example-style.json";
|
|
},
|
|
skipTargetLayerList: () =>
|
|
this.helper.get.elementByTestId("skip-target-layer-list"),
|
|
skipTargetLayerEditor: () =>
|
|
this.helper.get.elementByTestId("skip-target-layer-editor"),
|
|
canvas: () => this.helper.get.element("canvas"),
|
|
searchControl: () => this.helper.get.element(".maplibregl-ctrl-geocoder")
|
|
};
|
|
}
|