Merge pull request #296 from opengovsg/release

chore: [master] Merge release 4.33.0

.eslintrc

@@ -0,0 +1,63 @@
+{
+  "env": {
+    "commonjs": true,
+    "es6": true,
+    "node": true
+  },
+  "extends": ["eslint:recommended", "plugin:prettier/recommended"],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly",
+    "_": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "sourceType": "module",
+        "ecmaFeatures": {
+          "modules": true
+        }
+      },
+      "plugins": ["@typescript-eslint", "import", "simple-import-sort"],
+      "rules": {
+        // Rules for auto sort of imports
+        "simple-import-sort/sort": [
+          "error",
+          {
+            "groups": [
+              // Side effect imports.
+              ["^\\u0000"],
+              // Packages.
+              // Things that start with a letter (or digit or underscore), or
+              // `@` followed by a letter.
+              ["^@?\\w"],
+              // Root imports
+              ["^(src)(/.*|$)"],
+              // Parent imports. Put `..` last.
+              ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
+              // Other relative imports. Put same-folder imports and `.` last.
+              ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"]
+            ]
+          }
+        ],
+        "sort-imports": "off",
+        "import/order": "off",
+        "import/first": "error",
+        "import/newline-after-import": "error",
+        "import/no-duplicates": "error",
+        "@typescript-eslint/no-var-requires": "warn",
+        "@typescript-eslint/no-unused-vars": "error",
+        "no-unused-vars": "off"
+      }
+    }
+  ],
+  "rules": {
+    "no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
+    "no-console": "warn"
+  }
+}

.gitignore

@@ -59,3 +59,7 @@ tmp/
 # @shelf/jest-mongodb generated file
 # =======
 globalConfig.json
+
+# Tests
+# =======
+coverage/

.stylelintrc.js

@@ -4,5 +4,5 @@ module.exports = {
     'no-descending-specificity': [true, { severity: 'warning' }],
     'selector-type-no-unknown': [true, { ignore: ['custom-elements'] }],
   },
-  ignoreFiles: ['dist/**', "**/*.html"],
+  ignoreFiles: ['dist/**', '**/*.html', 'coverage/**'],
 }

README.md

@@ -1,6 +1,7 @@
 # FormSG
 
 [![Build Status](https://travis-ci.com/opengovsg/formsg.svg?branch=release)](https://travis-ci.com/opengovsg/formsg)
+[![Coverage Status](https://coveralls.io/repos/github/opengovsg/FormSG/badge.svg?branch=develop)](https://coveralls.io/github/opengovsg/FormSG?branch=develop)
 
 ## Table of Contents
 
@@ -10,6 +11,7 @@
     - [Prerequisites](#prerequisites)
     - [Running Locally](#running-locally)
     - [Environment variables](#environment-variables)
+    - [Trouble-shooting](#trouble-shooting)
   - [Testing](#testing)
     - [Testing Prerequisites](#testing-prerequisites)
     - [Running tests](#running-tests)

docs/DEPLOYMENT_SETUP.md

@@ -262,3 +262,5 @@ If this feature is enabled, storage mode forms will also support authentication
 | :--------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
 | `MONGO_BINARY_VERSION` | Version of the Mongo binary used. Defaults to `'latest'` according to [MongoMemoryServer](https://github.com/nodkz/mongodb-memory-server) docs. |
 | `PWD`                  | Path of working directory.                                                                                                                      |
+| `MOCK_WEBHOOK_CONFIG_FILE`                  | Path of configuration file for mock webhook server                                                                                                                      |
+| `MOCK_WEBHOOK_PORT`                  | Port of mock webhook server                                                                                                                      |

jest.config.js

@@ -4,8 +4,16 @@ module.exports = {
   preset: '@shelf/jest-mongodb',
   testMatch: ['**/?(*.)+(spec|test).[t]s?(x)'],
   modulePaths: ['<rootDir>'],
+  testPathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/node_modules/'],
   transform: {
     // Needed to use @shelf/jest-mongodb preset.
     ...tsJestPreset.transform,
   },
+  collectCoverageFrom: ['./src/**/*.{ts,js}'],
+  coveragePathIgnorePatterns: ['./node_modules/', './tests'],
+  coverageThreshold: {
+    global: {
+      statements: 12, // Increase this percentage as test coverage improves
+    },
+  },
 }