From 14ff431f20253eb283e3446845f9760a9ae9caac Mon Sep 17 00:00:00 2001 From: cesine Date: Thu, 4 Dec 2025 15:55:05 -0500 Subject: [PATCH 1/5] expect to contain --- test/integration/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/install.js b/test/integration/install.js index 772fc8da..f98db90e 100644 --- a/test/integration/install.js +++ b/test/integration/install.js @@ -230,7 +230,7 @@ describe('install', () => { }) .then((res) => { debug('res.body prototype couchapp', res.body); - expect(res.body.couchapp.name).to.equal(' Prototype (has the most features of the apps)', JSON.stringify(res.body)); + expect(res.body.couchapp.name).to.contain(' Prototype (has the most features of the apps)', JSON.stringify(res.body)); }); }); }); From 9c4102fa0f3b622ef2792243a9ff6761bb6e7187 Mon Sep 17 00:00:00 2001 From: cesine Date: Thu, 4 Dec 2025 17:19:54 -0500 Subject: [PATCH 2/5] update new_lexicon using https://github.com/FieldDB/FieldDB/pull/2188/commits/e5eae43f4f5633c1321ded70e4d8464335512851 --- test/integration/install.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/integration/install.js b/test/integration/install.js index f98db90e..5a3b3673 100644 --- a/test/integration/install.js +++ b/test/integration/install.js @@ -378,15 +378,17 @@ describe('install', () => { }) .then((res) => { debug('res.body new_lexicon', res.body); - expect(res.body.ok).to.equal(true); + expect(res.body.ok).to.equal(true, JSON.stringify(res.body)); return supertest(destination) - .get('/_all_dbs') + .get(`/${dbnameToReplicate}/_design/lexicon/_view/lexiconNodes?group=true`) .set('Accept', 'application/json'); }) .then((res) => { debug('res.body new_lexicon after ', res.body); - expect(res.body).includes(dbnameToReplicate); + expect(res.body).to.deep.equal({ + rows: [], + }, JSON.stringify(res.body)); }); }); }); From 54ba321796491d7098857c29c7d1a83cca5e4f4c Mon Sep 17 00:00:00 2001 From: cesine Date: Thu, 4 Dec 2025 17:22:51 -0500 Subject: [PATCH 3/5] update to latest couchdb 3.5.1 --- Dockerfile-couchdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-couchdb b/Dockerfile-couchdb index b26ae840..1fdd4ef0 100644 --- a/Dockerfile-couchdb +++ b/Dockerfile-couchdb @@ -1,4 +1,4 @@ -FROM couchdb:3.1.2 +FROM couchdb:3.5.1 WORKDIR / From 6a683f66c04ec5f24abdefffd8cf18cbabedf4e0 Mon Sep 17 00:00:00 2001 From: cesine Date: Fri, 5 Dec 2025 08:44:04 -0500 Subject: [PATCH 4/5] increase timeouts --- test/routes/deprecated-spec.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/routes/deprecated-spec.js b/test/routes/deprecated-spec.js index d9eb651e..a98cdb9b 100644 --- a/test/routes/deprecated-spec.js +++ b/test/routes/deprecated-spec.js @@ -552,9 +552,9 @@ describe('/ deprecated', () => { describe('/addroletouser', () => { before(function () { - debug('/forgotpassword', process.env.REPLAY); + debug('/addroletouser', process.env.REPLAY); - this.timeout(19000); + this.timeout(49000); return supertest(authWebService) .post('/register') @@ -1311,9 +1311,9 @@ describe('/ deprecated', () => { describe('/newcorpus', () => { before(function () { - debug('/forgotpassword', process.env.REPLAY); + debug('/newcorpus', process.env.REPLAY); - this.timeout(40000); + this.timeout(140000); return supertest(authWebService) .post('/register') @@ -1508,7 +1508,7 @@ describe('/ deprecated', () => { describe('syncDetails', () => { const uniqueDBname = process.env.REPLAY ? Date.now() : '1637871012346'; before(function () { - debug('/forgotpassword', process.env.REPLAY); + debug('/syncDetails', process.env.REPLAY); this.timeout(40000); return supertest(authWebService) From 54c92cba900aa4f6536b77c3251562af1ec8aa50 Mon Sep 17 00:00:00 2001 From: cesine Date: Fri, 5 Dec 2025 08:53:37 -0500 Subject: [PATCH 5/5] increase timeout in ci --- test/routes/deprecated-spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/routes/deprecated-spec.js b/test/routes/deprecated-spec.js index a98cdb9b..5cc8b20c 100644 --- a/test/routes/deprecated-spec.js +++ b/test/routes/deprecated-spec.js @@ -554,7 +554,7 @@ describe('/ deprecated', () => { before(function () { debug('/addroletouser', process.env.REPLAY); - this.timeout(49000); + this.timeout(149000); return supertest(authWebService) .post('/register')