Skip to content

Commit 2942038

Browse files
authored
test: conversions to vitest (#6585)
* test: conversions to vitest * fix(client-sts): fix compile error * fix: compilation fixes for clients
1 parent 0c74dc7 commit 2942038

File tree

341 files changed

+1757
-1226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

341 files changed

+1757
-1226
lines changed

clients/client-cognito-identity/karma.conf.js

-71
This file was deleted.

clients/client-cognito-identity/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
1313
"extract:docs": "api-extractor run --local",
1414
"generate:client": "node ../../scripts/generate-clients/single-service --solo cognito-identity",
15-
"test:e2e": "ts-mocha test/**/*.ispec.ts && karma start karma.conf.js"
15+
"test:e2e": "vitest run -c vitest.config.e2e.ts",
16+
"test:e2e:watch": "vitest watch -c vitest.config.e2e.ts"
1617
},
1718
"main": "./dist-cjs/index.js",
1819
"types": "./dist-types/index.d.ts",

clients/client-cognito-identity/test/e2e/CognitoIdentity.ispec.ts renamed to clients/client-cognito-identity/test/e2e/CognitoIdentity.e2e.spec.ts

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
/// <reference types="mocha" />
2-
/**
3-
* This is the integration test that make sure the client can make request cross-platform-ly
4-
* in NodeJS, Chromium and Firefox. This test is written in mocha.
5-
*/
6-
import { expect } from "chai";
1+
import { beforeAll, describe, expect, test as it } from "vitest";
72

3+
import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
84
import { CognitoIdentity } from "../../src/index";
9-
// There will be default values of defaultRegion, credentials, and isBrowser variable in browser tests.
10-
// Define the values for Node.js tests
11-
const region: string | undefined = (globalThis as any).defaultRegion || process?.env?.AWS_SMOKE_TEST_REGION;
12-
const IdentityPoolId =
13-
(globalThis as any)?.window?.__env__?.AWS_SMOKE_TEST_IDENTITY_POOL_ID ||
14-
process?.env?.AWS_SMOKE_TEST_IDENTITY_POOL_ID;
155

16-
describe("@aws-sdk/client-cognito-identity", function () {
17-
const unAuthClient = new CognitoIdentity({
18-
region,
6+
describe("@aws-sdk/client-cognito-identity", () => {
7+
let unAuthClient: CognitoIdentity;
8+
let region: string;
9+
let IdentityPoolId: string;
10+
11+
beforeAll(async () => {
12+
const integTestResourcesEnv = await getIntegTestResources();
13+
Object.assign(process.env, integTestResourcesEnv);
14+
15+
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
16+
IdentityPoolId =
17+
(globalThis as any)?.window?.__env__?.AWS_SMOKE_TEST_IDENTITY_POOL_ID ||
18+
process?.env?.AWS_SMOKE_TEST_IDENTITY_POOL_ID;
19+
20+
unAuthClient = new CognitoIdentity({
21+
region,
22+
});
1923
});
2024

2125
it("should successfully fetch Id and get credentials", async () => {

clients/client-cognito-identity/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"rootDir": "src",
1010
"useUnknownInCatchVariables": false
1111
},
12-
"exclude": ["test/"]
12+
"exclude": ["test/", "vitest.*.ts"]
1313
}

clients/client-cognito-identity/tsconfig.types.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"declarationDir": "dist-types",
77
"emitDeclarationOnly": true
88
},
9-
"exclude": ["test/**/*", "dist-types/**/*"]
9+
"exclude": ["test/**/*", "dist-types/**/*", "vitest.*.ts"]
1010
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
include: ["**/*.e2e.spec.ts"],
6+
environment: "happy-dom",
7+
},
8+
});

clients/client-kinesis/jest.config.e2e.js

-4
This file was deleted.

clients/client-kinesis/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
1313
"extract:docs": "api-extractor run --local",
1414
"generate:client": "node ../../scripts/generate-clients/single-service --solo kinesis",
15-
"test:e2e": "jest --config jest.config.e2e.js"
15+
"test:e2e": "vitest run -c vitest.config.e2e.ts",
16+
"test:e2e:watch": "vitest watch -c vitest.config.e2e.ts"
1617
},
1718
"main": "./dist-cjs/index.js",
1819
"types": "./dist-types/index.d.ts",

clients/client-kinesis/test/Kinesis.e2e.spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
import { test as it, describe, expect } from "vitest";
2+
13
import { KinesisClient, ListStreamsCommand } from "../src/index";
24

35
describe("@aws-sdk/client-kinesis", () => {
46
const client = new KinesisClient({});
57
const ONE_SECOND = 1 * 1000;
68

79
// TODO: not working in CI
8-
xit(
10+
it.skip(
911
`${ListStreamsCommand.name} should succeed`,
1012
async () => {
1113
const { StreamNames } = await client.send(new ListStreamsCommand({}));

clients/client-kinesis/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"rootDir": "src",
1010
"useUnknownInCatchVariables": false
1111
},
12-
"exclude": ["test/"]
12+
"exclude": ["test/", "vitest.*.ts"]
1313
}

clients/client-kinesis/tsconfig.types.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"declarationDir": "dist-types",
77
"emitDeclarationOnly": true
88
},
9-
"exclude": ["test/**/*", "dist-types/**/*"]
9+
"exclude": ["test/**/*", "dist-types/**/*", "vitest.*.ts"]
1010
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
include: ["**/*.e2e.spec.ts"],
6+
environment: "node",
7+
},
8+
});

clients/client-s3/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
*.log
99
package-lock.json
1010
!karma.conf.js
11+
/test/browser-build/browser-s3-bundle.js

clients/client-s3/jest.config.e2e.js

-5
This file was deleted.

clients/client-s3/karma.conf.js

-74
This file was deleted.

clients/client-s3/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
"clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
1313
"extract:docs": "api-extractor run --local",
1414
"generate:client": "node ../../scripts/generate-clients/single-service --solo s3",
15-
"test": "yarn test:unit",
16-
"test:e2e": "yarn test:e2e:node && yarn test:e2e:browser",
17-
"test:e2e:browser": "ts-mocha test/**/*.browser.ispec.ts && karma start karma.conf.js",
18-
"test:e2e:node": "jest --c jest.config.e2e.js",
19-
"test:unit": "ts-mocha test/unit/**/*.spec.ts"
15+
"test": "vitest run",
16+
"test:watch": "vitest watch",
17+
"test:e2e": "vitest run -c vitest.config.e2e.ts && yarn test:browser",
18+
"test:e2e:watch": "vitest watch -c vitest.config.e2e.ts",
19+
"test:browser": "node ./test/browser-build/esbuild && vitest run -c vitest.config.browser.ts",
20+
"test:browser:watch": "node ./test/browser-build/esbuild && vitest watch -c vitest.config.browser.ts"
2021
},
2122
"main": "./dist-cjs/index.js",
2223
"types": "./dist-types/index.d.ts",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const esbuild = require("esbuild");
2+
const path = require("path");
3+
4+
const buildOptions = {
5+
platform: "browser",
6+
target: ["chrome120"],
7+
bundle: true,
8+
format: "esm",
9+
mainFields: ["module", "browser", "main"],
10+
allowOverwrite: true,
11+
entryPoints: [path.join(__dirname, "..", "..", "dist-es", "index.js")],
12+
supported: {
13+
"dynamic-import": false,
14+
},
15+
outfile: path.join(__dirname, "browser-s3-bundle.js"),
16+
// packages: "external",
17+
external: [],
18+
};
19+
20+
esbuild.build(buildOptions);

0 commit comments

Comments
 (0)