Merge branch 'develop' into PW-2436/Notification

Author: KadoBOT

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+**Description**
+<!-- Please provide a description of the changes proposed in the Pull Request -->
+
+**Tested scenarios**
+<!-- Description of tested scenarios -->
+
+**Fixed issue**:  <!-- #-prefixed issue number -->

README.md

@@ -89,8 +89,7 @@ client.httpClient = httpClient;
 ```
 
 ## Support
-
-If you have any problems, questions or suggestions, create an issue here or send your inquiry to [email protected].
+If you have a feature request, or spotted a bug or a technical problem, create a GitHub issue. For other questions, contact our [support team](https://support.adyen.com/hc/en-us/requests/new?ticket_form_id=360000705420).
 
 ## Contributing
 We strongly encourage you to join us in contributing to this repository so everyone can benefit from:

jest.config.js

@@ -29,22 +29,17 @@ module.exports = {
         "<rootDir>/src/typings"
     ],
     setupFiles: ["<rootDir>config.ts", "dotenv/config"],
-    unmockedModulePathPatterns: [
-        "/dist"
-    ],
     testMatch: [
-        "**/__tests__/*.ts"
-    ],
-    testPathIgnorePatterns : [
-        "/node_modules",
-        "/dist"
+        "**/src/__tests__/**/*.spec.ts"
     ],
+    roots: ['<rootDir>/src'],
     transform: {
         ".ts": "ts-jest"
     },
     globals: {
         "ts-jest": {
-            compiler: "ttypescript"
+            compiler: "ttypescript",
+            transformIgnorePatterns: ['^.+\\\\.js$']
         }
-    }
+    },
 };

package.json

@@ -39,10 +39,10 @@
   "author": "Ricardo Ambrogi",
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "25.2.1",
+    "@types/jest": "25.2.3",
     "@types/nock": "11.1.0",
-    "@typescript-eslint/eslint-plugin": "2.31.0",
-    "@typescript-eslint/parser": "2.31.0",
+    "@typescript-eslint/eslint-plugin": "2.34.0",
+    "@typescript-eslint/parser": "2.34.0",
     "acorn": "^7.1.1",
     "coveralls": "3.1.0",
     "dotenv": "^8.2.0",
@@ -52,17 +52,17 @@
     "kind-of": "^6.0.3",
     "minimist": ">=1.2.3",
     "nock": "12.0.3",
-    "release-it": "13.5.8",
+    "release-it": "13.6.1",
     "ts-auto-mock": "^1.6.0",
-    "ts-jest": "25.5.0",
-    "ts-loader": "7.0.2",
+    "ts-jest": "25.5.1",
+    "ts-loader": "7.0.4",
     "ttypescript": "^1.5.10",
-    "typescript": "3.8.3",
+    "typescript": "3.9.3",
     "webpack": "4.43.0",
     "webpack-cli": "3.3.11"
   },
   "dependencies": {
-    "@types/node": "13.13.5",
+    "@types/node": "14.0.5",
     "https-proxy-agent": "5.0.0"
   }
 }

src/__tests__/checkout.spec.ts

@@ -33,6 +33,7 @@ import HttpClientException from "../httpClient/httpClientException";
 
 const merchantAccount = process.env.ADYEN_MERCHANT!;
 const reference = "Your order number";
+const isCI = process.env.CI === "true" || (typeof process.env.CI === "boolean" && process.env.CI);
 
 function createAmountObject(currency: string, value: number): ICheckout.Amount {
     return {
@@ -186,11 +187,8 @@ describe("Checkout", (): void => {
         expect(paymentSuccessLinkResponse).toBeTruthy();
     });
 
-    test.each([false, true])("should have payment details, isMock: %p", async (isMock): Promise<void> => {
-        if (!isMock) {
-            console.warn("Cannot perform /payments/details without manual user validation. Skipping test.");
-            return;
-        }
+    test.each([isCI, true])("should have payment details, isMock: %p", async (isMock): Promise<void> => {
+        !isMock && nock.restore();
         scope.post("/payments/details")
             .reply(200, paymentDetailsSuccess);
 
@@ -207,11 +205,8 @@ describe("Checkout", (): void => {
         expect(paymentSessionResponse.paymentSession).not.toBeUndefined();
     });
 
-    test.each([false, true])("should have payments result, isMock: %p", async (isMock): Promise<void> => {
-        if (!isMock) {
-            console.warn("Cannot perform /payments/result without payload. Skipping test.");
-            return;
-        }
+    test.each([isCI, true])("should have payments result, isMock: %p", async (isMock): Promise<void> => {
+        !isMock && nock.restore();
         scope.post("/payments/result")
             .reply(200, paymentsResultSuccess);
         const paymentResultRequest: ICheckout.PaymentVerificationRequest = {

src/__tests__/payout.spec.ts

@@ -5,6 +5,7 @@ import Client from "../client";
 import StoreDetailRequest = IPayouts.StoreDetailRequest;
 import {ApiConstants} from "../constants/apiConstants";
 
+const isCI = process.env.CI === "true" || (typeof process.env.CI === "boolean" && process.env.CI);
 const storeDetailAndSubmitThirdParty = JSON.stringify({
     additionalData: {
         fraudResultType: "GREEN",
@@ -148,7 +149,7 @@ describe("PayoutTest", function (): void {
         expect(result.pspReference).toBeTruthy();
     });
 
-    test.each([false, true])("should succeed on submit third party, isMock: %p", async function (isMock): Promise<void> {
+    test.each([isCI, true])("should succeed on submit third party, isMock: %p", async function (isMock): Promise<void> {
         !isMock && nock.restore();
         payout = new Payout(clientStore);
         scope.post("/submitThirdParty").reply(200, storeDetailAndSubmitThirdParty);

src/__tests__/recurring.spec.ts

@@ -15,6 +15,7 @@ const createRecurringDetailsRequest = (): IRecurring.RecurringDetailsRequest =>
         shopperReference: "shopperReference",
     };
 };
+const isCI = process.env.CI === "true" || (typeof process.env.CI === "boolean" && process.env.CI);
 
 let client: Client;
 let recurring: Recurring;
@@ -50,7 +51,7 @@ describe("Recurring", (): void => {
         }
     });
 
-    test.each([false, true])("should disable, isMock: %p", async (isMock): Promise<void> => {
+    test.each([isCI, true])("should disable, isMock: %p", async (isMock): Promise<void> => {
         !isMock && nock.restore();
         scope.post("/payments")
             .reply(200, paymentsSuccess);