Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@stylistic/eslint-plugin": "5.6.1",
"@types/accept-language-parser": "1.5.2",
"@types/backbone": "1.3.43",
"@types/chai": "4.1.7",
"@types/chai-as-promised": "7.1.0",
"@types/chai": "4.3.6",
"@types/chai-as-promised": "7.1.8",
"@types/color-convert": "2.0.4",
"@types/content-disposition": "0.5.2",
"@types/decompress": "^4.2.7",
Expand All @@ -74,7 +74,7 @@
"@types/lodash": "4.14.117",
"@types/lru-cache": "5.1.1",
"@types/mime-types": "2.1.0",
"@types/mocha": "10.0.1",
"@types/mocha": "10.0.10",
"@types/moment-timezone": "0.5.9",
"@types/mousetrap": "1.6.2",
"@types/node": "22.18.12",
Expand All @@ -85,7 +85,7 @@
"@types/qrcode": "1.4.2",
"@types/redlock": "3.0.2",
"@types/saml2-js": "2.0.1",
"@types/selenium-webdriver": "4.1.22",
"@types/selenium-webdriver": "4.35.5",
"@types/semver": "7.7.1",
"@types/sinon": "17.0.3",
"@types/sqlite3": "3.1.6",
Expand All @@ -99,8 +99,8 @@
"@typescript-eslint/eslint-plugin": "8.48.1",
"@typescript-eslint/parser": "8.48.1",
"app-module-path": "2.2.0",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"chai": "4.5.0",
"chai-as-promised": "7.1.2",
"chance": "1.0.16",
"chokidar-cli": "3.0.0",
"decompress": "^4.2.1",
Expand All @@ -110,8 +110,8 @@
"glob": "7.1.3",
"http-proxy": "1.18.1",
"i18next-scanner": "4.4.0",
"mocha": "11.0.1",
"mocha-webdriver": "0.3.4",
"mocha": "11.7.5",
"mocha-webdriver": "0.3.5",
"moment-locales-webpack-plugin": "^1.2.0",
"nock": "13.5.5",
"nodemon": "^3.1.9",
Expand Down
2 changes: 1 addition & 1 deletion test/common/airtable/AirtableSchemaImporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ describe("AirtableSchemaImporter", function() {
assert.deepInclude(testColumn, {
ref: { originalTableId: firstTableId },
...expectedColProps,
});
} as ColumnImportSchema);
});
});

Expand Down
2 changes: 1 addition & 1 deletion test/gen-server/ApiServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
import * as chai from "chai";
import omit from "lodash/omit";

const assert = chai.assert;
const assert: Chai.AssertStatic = chai.assert;

let server: TestServer;
let dbManager: HomeDBManager;
Expand Down
2 changes: 1 addition & 1 deletion test/gen-server/ApiServerAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import pick from "lodash/pick";
import moment from "moment";
import * as sinon from "sinon";

const assert = chai.assert;
const assert: Chai.AssertStatic = chai.assert;

let server: TestServer;
let dbManager: HomeDBManager;
Expand Down
2 changes: 1 addition & 1 deletion test/gen-server/lib/homedb/UsersManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ describe("UsersManager", function() {
id: user.id,
name: newInfo.name,
picture: newInfo.picture,
options: { locale: newInfo.locale },
options: { locale: newInfo.locale } as UserOptions,
});
assert.deepInclude(updatedUser.logins[0], {
email: newInfo.email.toLowerCase(),
Expand Down
8 changes: 4 additions & 4 deletions test/nbrowser/Themes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as gu from "test/nbrowser/gristUtils";
import { setupTestSuite } from "test/nbrowser/testUtils";

import { assert, By, ChromiumWebDriver, driver, Key } from "mocha-webdriver";
import { assert, By, chromium, driver, Key } from "mocha-webdriver";

const findSyncWithOSCheckbox = () => driver.find(".test-theme-config-sync-with-os");
const appearanceSelectCssSelector = ".test-theme-config-appearance .test-select-open:not(.disabled)";
Expand Down Expand Up @@ -83,15 +83,15 @@ describe("Themes", function() {
await assertAppliedTheme("GristLight");

// if using chromium web driver, fake the system color scheme to dark and wait for the theme to change
if ((driver as ChromiumWebDriver).sendDevToolsCommand) {
await (driver as ChromiumWebDriver).sendDevToolsCommand("Emulation.setEmulatedMedia", { features: [
if ((driver as chromium.ChromiumWebDriver).sendDevToolsCommand) {
await (driver as chromium.ChromiumWebDriver).sendDevToolsCommand("Emulation.setEmulatedMedia", { features: [
{ name: "prefers-color-scheme", value: "dark" },
] });
await driver.sleep(500);
await assertAppliedTheme("GristDark");

// reset back to default light system appearance
await (driver as ChromiumWebDriver).sendDevToolsCommand("Emulation.setEmulatedMedia", { features: [
await (driver as chromium.ChromiumWebDriver).sendDevToolsCommand("Emulation.setEmulatedMedia", { features: [
{ name: "prefers-color-scheme", value: "light" },
] });
await driver.sleep(500);
Expand Down
Loading
Loading