Skip to content

Commit 345279d

Browse files
gcatanesegcatanese
committed
Refactor tests
1 parent 51c84af commit 345279d

File tree

5 files changed

+70
-37
lines changed

5 files changed

+70
-37
lines changed

‎src/__mocks__/base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import Client from "../client";
21-
import Config from "../config";
21+
import Config, { EnvironmentEnum } from "../config";
2222
import {
2323
AmountsReq,
2424
MessageCategoryType,
@@ -37,7 +37,7 @@ import {
3737

3838
export const createClient = (apiKey = process.env.ADYEN_API_KEY): Client => {
3939
const config: Config = new Config();
40-
config.environment = "TEST";
40+
config.environment = EnvironmentEnum.TEST;
4141
config.terminalApiCloudEndpoint = Client.TERMINAL_API_ENDPOINT_TEST;
4242
config.terminalApiLocalEndpoint = "https://mocked_local_endpoint.com";
4343
config.marketPayEndpoint = Client.MARKETPAY_ENDPOINT_TEST;
@@ -49,7 +49,7 @@ export const createBasicAuthClient = (): Client => {
4949
return new Client({
5050
username: process.env.ADYEN_USER!,
5151
password: process.env.ADYEN_PASSWORD!,
52-
environment: "TEST",
52+
environment: EnvironmentEnum.TEST,
5353
applicationName: "adyen-node-api-library"
5454
});
5555
};

‎src/__tests__/checkout.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { checkout } from "../typings";
1616
import { IRequest } from "../typings/requestOptions";
1717
import { SessionResultResponse } from "../typings/checkout/sessionResultResponse";
1818
import { payments3DS2NativeAction } from "../__mocks__/checkout/payments3DS2NativeAction";
19+
import { EnvironmentEnum } from "../config";
1920

2021
const merchantAccount = process.env.ADYEN_MERCHANT!;
2122
const reference = "Your order number";
@@ -384,7 +385,7 @@ describe("Checkout", (): void => {
384385
// });
385386

386387
test("should have missing identifier on live", async (): Promise<void> => {
387-
client.config.environment = "LIVE";
388+
client.config.environment = EnvironmentEnum.LIVE;
388389
try {
389390
const liveCheckout = new CheckoutAPI(client);
390391
await liveCheckout.PaymentsApi.payments(createPaymentsCheckoutRequest());

‎src/__tests__/client.spec.ts

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
import Client from "../client";
2-
import Config, { RegionEnum } from "../config";
2+
import Config, { EnvironmentEnum, RegionEnum } from "../config";
33

44
describe("API Client", function (): void {
55
test("should be able to make a request using basic auth", async function (): Promise<void> {
66
new Client({
77
username: process.env.ADYEN_USER!,
88
password: process.env.ADYEN_PASSWORD!,
9-
environment: "TEST"
9+
environment: EnvironmentEnum.TEST
1010
});
1111
});
1212

1313
test("should create client with API key", () => {
1414
const client = new Client({
1515
apiKey: "ADYEN_API_KEY",
16-
environment: "TEST"
16+
environment: EnvironmentEnum.TEST
1717
});
1818

1919
expect(client.config.apiKey).toBe("ADYEN_API_KEY");
20+
expect(client.config.environment).toBe(EnvironmentEnum.TEST);
2021
expect(client.config.environment).toBe("TEST");
2122
expect(client.config.marketPayEndpoint).toBe(Client.MARKETPAY_ENDPOINT_TEST);
2223
});
@@ -25,18 +26,18 @@ describe("API Client", function (): void {
2526
const client = new Client({
2627
username: "username",
2728
password: "password",
28-
environment: "TEST"
29+
environment: EnvironmentEnum.TEST
2930
});
3031

3132
expect(client.config.username).toBe("username");
3233
expect(client.config.password).toBe("password");
33-
expect(client.config.environment).toBe("TEST");
34+
expect(client.config.environment).toBe(EnvironmentEnum.TEST);
3435
});
3536

3637
test("should set application name", () => {
3738
const client = new Client({
3839
apiKey: "ADYEN_API_KEY",
39-
environment: "TEST",
40+
environment: EnvironmentEnum.TEST,
4041
applicationName: "my_application_name"
4142
});
4243

@@ -46,7 +47,7 @@ describe("API Client", function (): void {
4647
test("should define timeout in Config", () => {
4748
const client = new Client({
4849
apiKey: "ADYEN_API_KEY",
49-
environment: "TEST",
50+
environment: EnvironmentEnum.TEST,
5051
connectionTimeoutMillis: 30000
5152
});
5253

@@ -56,7 +57,7 @@ describe("API Client", function (): void {
5657
test("should set timeout", () => {
5758
const client = new Client({
5859
apiKey: "ADYEN_API_KEY",
59-
environment: "TEST"
60+
environment: EnvironmentEnum.TEST
6061
});
6162

6263
client.setTimeouts(30000);
@@ -72,7 +73,7 @@ describe("API Client", function (): void {
7273
test("should throw error if environment is LIVE and region is invalid", () => {
7374
const config = new Config({
7475
apiKey: "ADYEN_API_KEY",
75-
environment: "LIVE",
76+
environment: EnvironmentEnum.LIVE,
7677
region: "INVALID" as RegionEnum,
7778
liveEndpointUrlPrefix: "prefix"
7879
});
@@ -84,7 +85,7 @@ describe("API Client", function (): void {
8485
test("should set terminalApiCloudEndpoint for TEST region", () => {
8586
const config = new Config({
8687
apiKey: "ADYEN_API_KEY",
87-
environment: "TEST"
88+
environment: EnvironmentEnum.TEST
8889
});
8990
const client = new Client(config);
9091
expect(client.config.terminalApiCloudEndpoint).toBeDefined();
@@ -94,7 +95,7 @@ describe("API Client", function (): void {
9495
test("should set terminalApiCloudEndpoint for LIVE region", () => {
9596
const config = new Config({
9697
apiKey: "ADYEN_API_KEY",
97-
environment: "LIVE",
98+
environment: EnvironmentEnum.LIVE,
9899
region: RegionEnum.US,
99100
liveEndpointUrlPrefix: "prefix"
100101
});
@@ -106,7 +107,7 @@ describe("API Client", function (): void {
106107
test("should set and get custom http client", () => {
107108
const config = new Config({
108109
apiKey: "ADYEN_API_KEY",
109-
environment: "TEST"
110+
environment: EnvironmentEnum.TEST
110111
});
111112
const client = new Client(config);
112113
const mockHttpClient = { request: jest.fn() };
@@ -117,10 +118,42 @@ describe("API Client", function (): void {
117118
test("should set application name via setApplicationName", () => {
118119
const config = new Config({
119120
apiKey: "ADYEN_API_KEY",
120-
environment: "TEST"
121+
environment: EnvironmentEnum.TEST
121122
});
122123
const client = new Client(config);
123124
client.setApplicationName("test_app");
124125
expect(client.config.applicationName).toBe("test_app");
125126
});
127+
128+
test("should return true for valid environments", () => {
129+
expect(Config.isEnvironmentValid(EnvironmentEnum.LIVE)).toBe(true);
130+
expect(Config.isEnvironmentValid(EnvironmentEnum.TEST)).toBe(true);
131+
});
132+
133+
test("should return false for invalid environments", () => {
134+
// @ts-expect-error purposely passing invalid value
135+
expect(Config.isEnvironmentValid("INVALID")).toBe(false);
136+
// @ts-expect-error purposely passing undefined
137+
expect(Config.isEnvironmentValid(undefined)).toBe(false);
138+
// @ts-expect-error purposely passing null
139+
expect(Config.isEnvironmentValid(null)).toBe(false);
140+
});
141+
142+
test("should return true for valid regions", () => {
143+
expect(Config.isRegionValid(RegionEnum.EU)).toBe(true);
144+
expect(Config.isRegionValid(RegionEnum.AU)).toBe(true);
145+
expect(Config.isRegionValid(RegionEnum.US)).toBe(true);
146+
expect(Config.isRegionValid(RegionEnum.APSE)).toBe(true);
147+
});
148+
149+
test("should return false for invalid regions", () => {
150+
// @ts-expect-error purposely passing invalid value
151+
expect(Config.isRegionValid("INVALID")).toBe(false);
152+
// @ts-expect-error purposely passing undefined
153+
expect(Config.isRegionValid(undefined)).toBe(false);
154+
// @ts-expect-error purposely passing null
155+
expect(Config.isRegionValid(null)).toBe(false);
156+
});
157+
126158
});
159+

‎src/__tests__/httpClient.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import HttpClientException from "../httpClient/httpClientException";
77
import { binlookup } from "../typings";
88
import { ApiConstants } from "../constants/apiConstants";
99
import { paymentMethodsSuccess } from "../__mocks__/checkout/paymentMethodsSuccess";
10-
import Config from "../config";
10+
import Config, { EnvironmentEnum } from "../config";
1111
import LibraryConstants from "../constants/libraryConstants";
1212

1313

@@ -28,7 +28,7 @@ const threeDSAvailabilitySuccess = {
2828
type errorType = "HttpClientException" | "ApiException";
2929
type testOptions = { errorType: errorType; errorMessageContains?: string; errorMessageEquals?: string };
3030

31-
const getResponse = async ({ apiKey, environment }: { apiKey: string; environment: Environment }, cb: (scope: Interceptor) => testOptions): Promise<void> => {
31+
const getResponse = async ({ apiKey, environment }: { apiKey: string; environment: EnvironmentEnum }, cb: (scope: Interceptor) => testOptions): Promise<void> => {
3232
const client = new Client({ apiKey, environment });
3333
const binLookup = new BinLookupAPI(client);
3434

@@ -55,7 +55,7 @@ describe("HTTP Client", function (): void {
5555

5656
test("Should return ApiException with message containing 'mocked_error_response'", async () => {
5757
await getResponse(
58-
{ apiKey: "", environment: "TEST" },
58+
{ apiKey: "", environment: EnvironmentEnum.TEST },
5959
(scope) => {
6060
scope.replyWithError("mocked_error_response");
6161
return {
@@ -69,7 +69,7 @@ describe("HTTP Client", function (): void {
6969

7070
test("Should return ApiException with message equal to 'some_error'", async () => {
7171
await getResponse(
72-
{ apiKey: "MOCKED_API_KEY", environment: "TEST" },
72+
{ apiKey: "MOCKED_API_KEY", environment: EnvironmentEnum.TEST },
7373
(scope) => {
7474
scope.replyWithError("some_error");
7575
return {
@@ -83,7 +83,7 @@ describe("HTTP Client", function (): void {
8383

8484
test("Should return HttpClientException with message equal to 'HTTP Exception: 401. null: Invalid Request'", async () => {
8585
await getResponse(
86-
{ apiKey: "API_KEY", environment: "TEST" },
86+
{ apiKey: "API_KEY", environment: EnvironmentEnum.TEST },
8787
(scope) => {
8888
scope.reply(401, { status: 401, message: "Invalid Request", errorCode: "171", errorType: "validationError" });
8989
return {
@@ -97,7 +97,7 @@ describe("HTTP Client", function (): void {
9797

9898
test("Should return HttpClientException with message equal to 'HTTP Exception: 401. null'", async () => {
9999
await getResponse(
100-
{ apiKey: "API_KEY", environment: "TEST" },
100+
{ apiKey: "API_KEY", environment: EnvironmentEnum.TEST },
101101
(scope) => {
102102
scope.reply(401, {});
103103
return {
@@ -111,7 +111,7 @@ describe("HTTP Client", function (): void {
111111

112112
test("Should return HttpClientException with message starting with 'HTTP Exception: 401'", async () => {
113113
await getResponse(
114-
{ apiKey: "API_KEY", environment: "TEST" },
114+
{ apiKey: "API_KEY", environment: EnvironmentEnum.TEST },
115115
(scope) => {
116116
scope.reply(401, "fail");
117117
return {

‎src/__tests__/service.spec.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Service from "../service";
22
import Client from "../client";
3-
import Config from "../config";
3+
import Config, { EnvironmentEnum } from "../config";
44

55
class TestService extends Service {
66
public constructor(client: Client) {
@@ -17,8 +17,7 @@ describe("Service", () => {
1717
beforeEach(() => {
1818
// Default config for each test
1919
client = new Client(new Config({
20-
apiKey: "test_key",
21-
environment: "TEST"
20+
environment: EnvironmentEnum.TEST
2221
}));
2322
});
2423

@@ -32,11 +31,11 @@ describe("Service", () => {
3231
// create Client for TEST environment without liveEndpointUrlPrefix
3332
const config = new Config({
3433
apiKey: "test_key",
35-
environment: "TEST"
34+
environment: EnvironmentEnum.TEST
3635
});
3736
client = new Client(config);
3837
// change to LIVE
39-
client.config.environment = "LIVE";
38+
client.config.environment = EnvironmentEnum.LIVE;
4039

4140
const service = new TestService(client);
4241
expect(() => service.testCreateBaseUrl("https://pal-live.adyen.com/pal/servlet/"))
@@ -47,12 +46,12 @@ describe("Service", () => {
4746
// create Client for TEST environment without liveEndpointUrlPrefix
4847
const config = new Config({
4948
apiKey: "test_key",
50-
environment: "TEST",
49+
environment: EnvironmentEnum.TEST,
5150
liveEndpointUrlPrefix: ""
5251
});
5352
client = new Client(config);
5453
// change to LIVE
55-
client.config.environment = "LIVE";
54+
client.config.environment = EnvironmentEnum.LIVE;
5655

5756
const service = new TestService(client);
5857
expect(() => service.testCreateBaseUrl("https://pal-live.adyen.com/pal/servlet/"))
@@ -62,7 +61,7 @@ describe("Service", () => {
6261
it("should replace pal-test with pal-live using liveEndpointUrlPrefix", () => {
6362
const config = new Config({
6463
apiKey: "test_key",
65-
environment: "LIVE",
64+
environment: EnvironmentEnum.LIVE,
6665
liveEndpointUrlPrefix: "mycompany"
6766
});
6867
client = new Client(config);
@@ -78,12 +77,12 @@ describe("Service", () => {
7877
// create Client for TEST environment without liveEndpointUrlPrefix
7978
const config = new Config({
8079
apiKey: "test_key",
81-
environment: "TEST",
80+
environment: EnvironmentEnum.TEST,
8281
liveEndpointUrlPrefix: ""
8382
});
8483
client = new Client(config);
8584
// change to LIVE
86-
client.config.environment = "LIVE";
85+
client.config.environment = EnvironmentEnum.LIVE;
8786

8887
const service = new TestService(client);
8988
expect(() => service.testCreateBaseUrl("https://checkout-test.adyen.com/"))
@@ -93,7 +92,7 @@ describe("Service", () => {
9392
it("should replace checkout-test with checkout-live using liveEndpointUrlPrefix", () => {
9493
const config = new Config({
9594
apiKey: "test_key",
96-
environment: "LIVE",
95+
environment: EnvironmentEnum.LIVE,
9796
liveEndpointUrlPrefix: "mycompany"
9897
});
9998
client = new Client(config);
@@ -108,7 +107,7 @@ describe("Service", () => {
108107
it("should replace checkout-test with checkout-live for possdk/v68 using liveEndpointUrlPrefix", () => {
109108
const config = new Config({
110109
apiKey: "test_key",
111-
environment: "LIVE",
110+
environment: EnvironmentEnum.LIVE,
112111
liveEndpointUrlPrefix: "mycompany"
113112
});
114113
client = new Client(config);
@@ -123,7 +122,7 @@ describe("Service", () => {
123122
it("should replace -test with -live for other URLs", () => {
124123
const config = new Config({
125124
apiKey: "test_key",
126-
environment: "LIVE",
125+
environment: EnvironmentEnum.LIVE,
127126
liveEndpointUrlPrefix: "mycompany"
128127
});
129128
client = new Client(config);

0 commit comments

Comments
 (0)