Skip to content

Commit 8269241

Browse files
authored
Merge pull request #121 from FieldDB/fix_replication
Update ci to use latest couchdb 3.5.1
2 parents 7bc9601 + 54c92cb commit 8269241

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

Dockerfile-couchdb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM couchdb:3.1.2
1+
FROM couchdb:3.5.1
22

33
WORKDIR /
44

test/integration/install.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ describe('install', () => {
230230
})
231231
.then((res) => {
232232
debug('res.body prototype couchapp', res.body);
233-
expect(res.body.couchapp.name).to.equal(' Prototype (has the most features of the apps)', JSON.stringify(res.body));
233+
expect(res.body.couchapp.name).to.contain(' Prototype (has the most features of the apps)', JSON.stringify(res.body));
234234
});
235235
});
236236
});
@@ -378,15 +378,17 @@ describe('install', () => {
378378
})
379379
.then((res) => {
380380
debug('res.body new_lexicon', res.body);
381-
expect(res.body.ok).to.equal(true);
381+
expect(res.body.ok).to.equal(true, JSON.stringify(res.body));
382382

383383
return supertest(destination)
384-
.get('/_all_dbs')
384+
.get(`/${dbnameToReplicate}/_design/lexicon/_view/lexiconNodes?group=true`)
385385
.set('Accept', 'application/json');
386386
})
387387
.then((res) => {
388388
debug('res.body new_lexicon after ', res.body);
389-
expect(res.body).includes(dbnameToReplicate);
389+
expect(res.body).to.deep.equal({
390+
rows: [],
391+
}, JSON.stringify(res.body));
390392
});
391393
});
392394
});

test/routes/deprecated-spec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ describe('/ deprecated', () => {
552552

553553
describe('/addroletouser', () => {
554554
before(function () {
555-
debug('/forgotpassword', process.env.REPLAY);
555+
debug('/addroletouser', process.env.REPLAY);
556556

557-
this.timeout(19000);
557+
this.timeout(149000);
558558

559559
return supertest(authWebService)
560560
.post('/register')
@@ -1311,9 +1311,9 @@ describe('/ deprecated', () => {
13111311

13121312
describe('/newcorpus', () => {
13131313
before(function () {
1314-
debug('/forgotpassword', process.env.REPLAY);
1314+
debug('/newcorpus', process.env.REPLAY);
13151315

1316-
this.timeout(40000);
1316+
this.timeout(140000);
13171317

13181318
return supertest(authWebService)
13191319
.post('/register')
@@ -1508,7 +1508,7 @@ describe('/ deprecated', () => {
15081508
describe('syncDetails', () => {
15091509
const uniqueDBname = process.env.REPLAY ? Date.now() : '1637871012346';
15101510
before(function () {
1511-
debug('/forgotpassword', process.env.REPLAY);
1511+
debug('/syncDetails', process.env.REPLAY);
15121512

15131513
this.timeout(40000);
15141514
return supertest(authWebService)

0 commit comments

Comments
 (0)