Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2025-06-13 20:53:59 +00:00
Code Issues Projects Releases Wiki Activity

move webhooksTestPort out of global scope

Browse Source
This commit is contained in:
Paul Fitzpatrick 2024-10-09 17:28:26 -04:00
parent ed78009e41
commit bae035b130
No known key found for this signature in database
GPG Key ID: 07F16BF3214888F6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/server/lib/DocApi.ts
View File

@ -76,6 +76,8 @@ function makeConfig(username: string): AxiosRequestConfig {
} }
describe('DocApi', function () { describe('DocApi', function () {
const webhooksTestPort = Number(process.env.WEBHOOK_TEST_PORT || 34365);
this.timeout(30000); this.timeout(30000);
testUtils.setTmpLogLevel('error'); testUtils.setTmpLogLevel('error');
let oldEnv: testUtils.EnvironmentSnapshot; let oldEnv: testUtils.EnvironmentSnapshot;
@ -121,7 +123,7 @@ describe('DocApi', function () {
homeUrl = serverUrl = home.serverUrl; homeUrl = serverUrl = home.serverUrl;
hasHomeApi = true; hasHomeApi = true;
}); });
testDocApi(); testDocApi({webhooksTestPort});
}); });
describe('With GRIST_ANON_PLAYGROUND disabled', async () => { describe('With GRIST_ANON_PLAYGROUND disabled', async () => {
@ -157,7 +159,7 @@ describe('DocApi', function () {
homeUrl = serverUrl = home.serverUrl; homeUrl = serverUrl = home.serverUrl;
hasHomeApi = true; hasHomeApi = true;
}); });
testDocApi(); testDocApi({webhooksTestPort});
}); });
describe('behind a reverse-proxy', function () { describe('behind a reverse-proxy', function () {
@ -206,7 +208,7 @@ describe('DocApi', function () {
after(() => tearDown(proxy, [home, docs])); after(() => tearDown(proxy, [home, docs]));
testDocApi(); testDocApi({webhooksTestPort});
}); });
async function testCompareDocs(proxy: TestServerReverseProxy, home: TestServer) { async function testCompareDocs(proxy: TestServerReverseProxy, home: TestServer) {
@ -261,7 +263,7 @@ describe('DocApi', function () {
serverUrl = docs.serverUrl; serverUrl = docs.serverUrl;
hasHomeApi = false; hasHomeApi = false;
}); });
testDocApi(); testDocApi({webhooksTestPort});
}); });
} }
@ -323,7 +325,10 @@ describe('DocApi', function () {
}); });
// Contains the tests. This is where you want to add more test. // Contains the tests. This is where you want to add more test.
function testDocApi() { function testDocApi(settings: {
webhooksTestPort: number,
}) {
const { webhooksTestPort } = settings;
let chimpy: AxiosRequestConfig, kiwi: AxiosRequestConfig, let chimpy: AxiosRequestConfig, kiwi: AxiosRequestConfig,
charon: AxiosRequestConfig, nobody: AxiosRequestConfig, support: AxiosRequestConfig; charon: AxiosRequestConfig, nobody: AxiosRequestConfig, support: AxiosRequestConfig;
@ -5385,8 +5390,6 @@ async function getWorkspaceId(api: UserAPIImpl, name: string) {
return workspaces.find((w) => w.name === name)!.id; return workspaces.find((w) => w.name === name)!.id;
} }
const webhooksTestPort = Number(process.env.WEBHOOK_TEST_PORT || 34365);
async function setupDataDir(dir: string) { async function setupDataDir(dir: string) {
// we'll be serving Hello.grist content for various document ids, so let's make copies of it in // we'll be serving Hello.grist content for various document ids, so let's make copies of it in
// tmpDir // tmpDir