(core) updates from grist-core

test/nbrowser/Localization.ts

@@ -8,6 +8,18 @@ import fs from "fs";
 import os from "os";
 import path from 'path';
 
+
+// We only support those formats for now:
+// en.client.json
+// en_US.client.json
+// en_US.server.json
+// zh_Hant.client.json
+// {lang code (+ maybe with underscore and country code}.{namespace}.json
+//
+// Only this format was tested and is known to work.
+
+const VALID_LOCALE_FORMAT = /^[a-z]{2,}(_\w+)?\.(\w+)\.json$/;
+
 describe("Localization", function() {
   this.timeout(60000);
   setupTestSuite();
@@ -40,20 +52,20 @@ describe("Localization", function() {
     const langs: Set<string> = new Set();
     const namespaces: Set<string> = new Set();
     for (const file of fs.readdirSync(localeDirectory)) {
-      if (file.endsWith(".json")) {
-        const langRaw = file.split('.')[0];
-        const lang = langRaw?.replace(/_/g, '-');
-        const ns = file.split('.')[1];
-        const clientFile = path.join(localeDirectory,
-                                     `${langRaw}.client.json`);
-        const clientText = fs.readFileSync(clientFile, { encoding: 'utf8' });
-        if (!clientText.includes('Translators: please translate this only when')) {
-          // Translation not ready if this key is not present.
-          continue;
-        }
-        langs.add(lang);
-        namespaces.add(ns);
+      // Make sure we see only valid files.
+      assert.match(file, VALID_LOCALE_FORMAT);
+      const langRaw = file.split('.')[0];
+      const lang = langRaw?.replace(/_/g, '-');
+      const ns = file.split('.')[1];
+      const clientFile = path.join(localeDirectory,
+                                    `${langRaw}.client.json`);
+      const clientText = fs.readFileSync(clientFile, { encoding: 'utf8' });
+      if (!clientText.includes('Translators: please translate this only when')) {
+        // Translation not ready if this key is not present.
+        continue;
       }
+      langs.add(lang);
+      namespaces.add(ns);
     }
     assert.deepEqual(gristConfig.supportedLngs.sort(), [...langs].sort());
     assert.deepEqual(gristConfig.namespaces.sort(), [...namespaces].sort());
@@ -90,6 +102,8 @@ describe("Localization", function() {
       const enResponse = await (await fetch(homeUrl)).text();
       const uzResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "uz-UZ,uz;q=1"}})).text();
       const ptResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "pt-PR,pt;q=1"}})).text();
+      // We have file with nb_NO code, but still this should be preloaded.
+      const noResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "nb-NO,nb;q=1"}})).text();
 
       function present(response: string, ...langs: string[]) {
         for (const lang of langs) {
@@ -107,6 +121,7 @@ describe("Localization", function() {
       present(enResponse, "en");
       present(uzResponse, "en");
       present(ptResponse, "en");
+      present(noResponse, "en");
 
       // Other locales are not preloaded for English.
       notPresent(enResponse, "uz", "un-UZ", "en-US");
@@ -117,6 +132,9 @@ describe("Localization", function() {
       notPresent(uzResponse, "uz-UZ");
 
       notPresent(ptResponse, "pt-PR", "uz", "en-US");
+
+      // For no-NO we have nb_NO file.
+      present(noResponse, "nb_NO");
     });
 
     it("loads correct languages from file system", async function() {

test/nbrowser/WebhookOverflow.ts

@@ -34,6 +34,7 @@ describe('WebhookOverflow', function () {
       enabled: true,
       name: 'test webhook',
       tableId: 'Table2',
+      watchedColIds: []
     };
     await docApi.addWebhook(webhookDetails);
     await docApi.addWebhook(webhookDetails);

test/nbrowser/WebhookPage.ts

@@ -55,6 +55,7 @@ describe('WebhookPage', function () {
       'URL',
       'Table',
       'Ready Column',
+      'Filter for changes in these columns (semicolon-separated ids)',
       'Webhook Id',
       'Enabled',
       'Status',
@@ -80,15 +81,17 @@ describe('WebhookPage', function () {
     await gu.waitToPass(async () => {
       assert.equal(await getField(1, 'Webhook Id'), id);
     });
-    // Now other fields like name and memo are persisted.
+    // Now other fields like name, memo and watchColIds are persisted.
     await setField(1, 'Name', 'Test Webhook');
     await setField(1, 'Memo', 'Test Memo');
+    await setField(1, 'Filter for changes in these columns (semicolon-separated ids)', 'A; B');
     await gu.waitForServer();
     await driver.navigate().refresh();
     await waitForWebhookPage();
     await gu.waitToPass(async () => {
       assert.equal(await getField(1, 'Name'), 'Test Webhook');
       assert.equal(await getField(1, 'Memo'), 'Test Memo');
+      assert.equal(await getField(1, 'Filter for changes in these columns (semicolon-separated ids)'), 'A;B');
     });
     // Make sure the webhook is actually working.
     await docApi.addRows('Table1', {A: ['zig'], B: ['zag']});

test/nbrowser/testServer.ts

@@ -67,6 +67,9 @@ export class TestServerMerged extends EventEmitter implements IMochaServer {
     this._starts++;
     const workerIdText = process.env.MOCHA_WORKER_ID || '0';
     if (reset) {
+      // Make sure this test server doesn't keep using the DB that's about to disappear.
+      await this.closeDatabase();
+
       if (process.env.TESTDIR) {
         this.testDir = path.join(process.env.TESTDIR, workerIdText);
       } else {