Skip to content

Commit 6cae510

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/nodemailer-7.0.11
2 parents e237f44 + 454fe45 commit 6cae510

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/node.js.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ jobs:
3838
- name: Create local config for tests
3939
run: |
4040
echo 'module.exports = { usersDbConnection: { url: "http://localhost:5984" }};' > config/local.js
41-
env:
42-
SOURCE_URL: ${{ secrets.SOURCE_URL }}
4341
4442
- name: Start docker compose services
45-
run: docker compose up -d
43+
run: docker compose up -d && sleep 5
4644

4745
- name: Show docker compose logs
4846
run: docker compose logs --no-color --timestamps || true

test/routes/deprecated-spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,8 +1590,9 @@ describe('/ deprecated', () => {
15901590
expect(res.body.total_rows).to.equal(1, JSON.stringify(res.body));
15911591
} else {
15921592
debug('syncDetails', JSON.stringify(res.body));
1593-
// delay in views creation on new resources
1594-
expect(res.status).to.be.oneOf([401, 404], JSON.stringify(res.body));
1593+
// FIXME roles for the offline corpora are not being updated on the user
1594+
// due to a conflict when saving the user
1595+
expect(res.status).to.be.oneOf([403], JSON.stringify(res.body));
15951596
}
15961597
});
15971598
});

0 commit comments

Comments
 (0)