Skip to content

Commit

Permalink
Merge branch 'develop' into shared-folder
Browse files Browse the repository at this point in the history
* develop:
  refactor: use shared function to initialize models (#1172)
  chore: setup scaffolding for backend tests (#940)
  1.23.0
  fix(frontend): fix frontend test flakiness (#1162)
  fix: update successful delivery status only if error does not exist (#1150)
  chore: upgrade dependencies (#1153)
  feat: add unit tests for error states in critical workflows (#1118)
  feat: support whitelisting domains through `agencies` table (#1141)
  feat: add tests for happy paths in critical workflows (#1110)
  fix: prevent campaign names from causing dashboard rows to overflow (#1147)
  fix(email): Fix SendGrid fallback integration (#1026)
  • Loading branch information
lamkeewei committed May 5, 2021
2 parents 0cd675b + 8cdd8d6 commit 32d343f
Show file tree
Hide file tree
Showing 77 changed files with 4,599 additions and 264 deletions.
11 changes: 9 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"files": "package-lock.json|^.secrets.baseline$",
"lines": null
},
"generated_at": "2020-10-19T02:55:47Z",
"generated_at": "2021-04-09T07:48:36Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -55,10 +55,17 @@
}
],
"results": {
"backend/src/test-utils/test-env.ts": [
{
"hashed_secret": "c237a19676ad55d8904be354990dd54f92f9572c",
"is_verified": false,
"line_number": 4,
"type": "Base64 High Entropy String"
}
],
"frontend/.env-example": [
{
"hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
"is_secret": false,
"is_verified": false,
"line_number": 5,
"type": "Basic Auth Credentials"
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ node_js:

services:
- docker
- postgresql
- redis-server

cache: npm

Expand Down
1 change: 0 additions & 1 deletion amplify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ frontend:
build:
commands:
- npm run build
- CI=true npm run test
- npm run upload-source-map
artifacts:
# IMPORTANT - Please verify your build output directory
Expand Down
3 changes: 2 additions & 1 deletion backend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
module.exports = {
root: false,
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint'],
plugins: ['@typescript-eslint', "jest"],
extends: [
'eslint:recommended', // Recommended ESLint rules
'plugin:@typescript-eslint/eslint-recommended', // Disables rules from `eslint:recommended` that are already covered by the TypeScript typechecker
'plugin:@typescript-eslint/recommended', // Recommended TypeScript rules
'prettier/@typescript-eslint', // Disables rules from `@typescript-eslint/recommended` that are covered by Prettier
'plugin:prettier/recommended', // Recommended Prettier rules
"plugin:jest/recommended" // Recommended Jest rules
],
parserOptions: {
sourceType: 'module',
Expand Down
10 changes: 8 additions & 2 deletions backend/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
module.exports = {
roots: ['<rootDir>'],
testMatch: ['**/__tests__/**/*.(spec|test).+(ts|tsx|js)'],
testMatch: ['**/tests/**/*.(spec|test).+(ts|tsx|js)'],
testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/'],
moduleNameMapper: {
'@core/(.*)': '<rootDir>/src/core/$1',
'@sms/(.*)': '<rootDir>/src/sms/$1',
'@email/(.*)': '<rootDir>/src/email/$1',
'@telegram/(.*)': '<rootDir>/src/telegram/$1',
'@test-utils/(.*)': '<rootDir>/src/test-utils/$1',
},
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
},
testEnvironment: 'node',
setupFilesAfterEnv: ['<rootDir>/__tests__/setup.js'],
globalSetup: '<rootDir>/src/test-utils/global-setup.ts',
globalTeardown: '<rootDir>/src/test-utils/global-teardown.ts',
setupFiles: ['<rootDir>/src/test-utils/test-env.ts'],
setupFilesAfterEnv: ['<rootDir>/src/test-utils/setup.ts'],
}
Loading

0 comments on commit 32d343f

Please sign in to comment.