Skip to content

Commit

Permalink
Merge branch 'main' into feature/PIX-9190
Browse files Browse the repository at this point in the history
  • Loading branch information
ali-zenika committed Jan 22, 2024
2 parents 94f333e + 59b8246 commit 19f224c
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 126 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
jobs:
build-and-test:
docker:
- image: cimg/node:20.8.1
- image: cimg/node:20.11.0
steps:
- checkout
- run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.8.1
20.11.0
211 changes: 88 additions & 123 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.92.0",
"description": "Automating development actions",
"engines": {
"node": "^20.8.1"
"node": "^20.11.0"
},
"main": "index.js",
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions run/deploy-configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ module.exports = [
'master',
),
},
{
slashCommand: {
command: '/deploy-privatebin',
description: 'Déploie privatebin',
usage_hint: '/deploy-privatebin',
},
slackReturnText: 'Commande de déploiement de PrivateBin en production bien reçue.',
deployFunction: fromBranch('privatebin-deploy', ['pix-privatebin-production'], 'main'),
},
{
slashCommand: {
command: '/deploy-pix-apim',
Expand Down
7 changes: 7 additions & 0 deletions test/acceptance/run/manifest_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ describe('Acceptance | Run | Manifest', function () {
url: `http://${hostname}/slack/commands/deploy-metabase`,
usage_hint: '/deploy-metabase',
},
{
command: '/deploy-privatebin',
description: 'Déploie privatebin',
should_escape: false,
url: `http://${hostname}/slack/commands/deploy-privatebin`,
usage_hint: '/deploy-privatebin',
},
{
command: '/deploy-pix-apim',
description: 'Pour déployer les applications Pix APIM depuis la branche main',
Expand Down
13 changes: 13 additions & 0 deletions test/acceptance/run/slashcommand_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ describe('Acceptance | Run | SlashCommand', function () {
expect(res.result.text).to.equal('Commande de déploiement de Metabase en production bien reçue.');
});
});
describe('POST /slack/commands/deploy-privatebin', function () {
it('responds with 200', async function () {
const body = {};
const res = await server.inject({
method: 'POST',
url: '/slack/commands/deploy-privatebin',
headers: createSlackWebhookSignatureHeaders(JSON.stringify(body)),
payload: body,
});
expect(res.statusCode).to.equal(200);
expect(res.result.text).to.equal('Commande de déploiement de PrivateBin en production bien reçue.');
});
});

describe('POST /slack/commands/deploy-pix-apim', function () {
it('responds with 200', async function () {
Expand Down

0 comments on commit 19f224c

Please sign in to comment.