From c531c2142bf1953676285a11658ee0d5bd7e0872 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Tue, 1 Oct 2024 10:36:51 +0200 Subject: [PATCH] test(logger): switch e2e tests to vitest --- packages/logger/jest.config.cjs | 30 ------------------- packages/logger/package.json | 8 ++--- .../tests/e2e/basicFeatures.middy.test.ts | 6 +--- .../tests/e2e/childLogger.manual.test.ts | 6 +--- .../e2e/logEventEnvVarSetting.middy.test.ts | 6 +--- .../tests/e2e/sampleRate.decorator.test.ts | 6 +--- 6 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 packages/logger/jest.config.cjs diff --git a/packages/logger/jest.config.cjs b/packages/logger/jest.config.cjs deleted file mode 100644 index 0aeadae05f..0000000000 --- a/packages/logger/jest.config.cjs +++ /dev/null @@ -1,30 +0,0 @@ -module.exports = { - displayName: { - name: 'Powertools for AWS Lambda (TypeScript) utility: LOGGER', - color: 'cyan', - }, - runner: 'groups', - moduleNameMapper: { - '^(\\.{1,2}/.*)\\.js$': '$1', - }, - transform: { - '^.+\\.ts?$': 'ts-jest', - }, - moduleFileExtensions: ['js', 'ts'], - collectCoverageFrom: ['**/src/**/*.ts', '!**/node_modules/**'], - testMatch: ['**/?(*.)+(spec|test).ts'], - roots: ['/src', '/tests'], - testPathIgnorePatterns: ['/node_modules/'], - testEnvironment: 'node', - coveragePathIgnorePatterns: ['/node_modules/', 'src/types/index.ts'], - coverageThreshold: { - global: { - statements: 100, - branches: 100, - functions: 100, - lines: 100, - }, - }, - coverageReporters: ['json-summary', 'text', 'lcov'], - setupFiles: ['/tests/helpers/setupEnv.ts'], -}; diff --git a/packages/logger/package.json b/packages/logger/package.json index 79e27f5ff1..a5760007ce 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -14,10 +14,10 @@ "test:unit": "vitest --run tests/unit", "test:unit:coverage": "vitest --run tests/unit --coverage.enabled --coverage.thresholds.100 --coverage.include='src/**'", "test:unit:types": "echo 'Not Implemented'", - "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", - "test:e2e:nodejs20x": "RUNTIME=nodejs20x jest --group=e2e", - "test:e2e": "jest --group=e2e", - "watch": "jest --watch --group=unit", + "test:unit:watch": "vitest tests/unit", + "test:e2e:nodejs18x": "RUNTIME=nodejs18x vitest --run tests/e2e", + "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", + "test:e2e": "vitest --run tests/e2e", "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", diff --git a/packages/logger/tests/e2e/basicFeatures.middy.test.ts b/packages/logger/tests/e2e/basicFeatures.middy.test.ts index 086e31c7a7..9f373c718d 100644 --- a/packages/logger/tests/e2e/basicFeatures.middy.test.ts +++ b/packages/logger/tests/e2e/basicFeatures.middy.test.ts @@ -1,8 +1,3 @@ -/** - * Test logger basic features - * - * @group e2e/logger/basicFeatures - */ import { join } from 'node:path'; import { TestInvocationLogs, @@ -10,6 +5,7 @@ import { invokeFunction, } from '@aws-lambda-powertools/testing-utils'; import type { APIGatewayAuthorizerResult } from 'aws-lambda'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { LoggerTestNodejsFunction } from '../helpers/resources.js'; import { RESOURCE_NAME_PREFIX, diff --git a/packages/logger/tests/e2e/childLogger.manual.test.ts b/packages/logger/tests/e2e/childLogger.manual.test.ts index 3fe16a9446..a52584ab25 100644 --- a/packages/logger/tests/e2e/childLogger.manual.test.ts +++ b/packages/logger/tests/e2e/childLogger.manual.test.ts @@ -1,14 +1,10 @@ -/** - * Test logger child logger - * - * @group e2e/logger/childLogger - */ import { join } from 'node:path'; import { TestInvocationLogs, TestStack, invokeFunction, } from '@aws-lambda-powertools/testing-utils'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { LoggerTestNodejsFunction } from '../helpers/resources.js'; import { RESOURCE_NAME_PREFIX, diff --git a/packages/logger/tests/e2e/logEventEnvVarSetting.middy.test.ts b/packages/logger/tests/e2e/logEventEnvVarSetting.middy.test.ts index 32656be427..21c2dad621 100644 --- a/packages/logger/tests/e2e/logEventEnvVarSetting.middy.test.ts +++ b/packages/logger/tests/e2e/logEventEnvVarSetting.middy.test.ts @@ -1,14 +1,10 @@ -/** - * Test logger basic features - * - * @group e2e/logger/logEventEnvVarSetting - */ import { join } from 'node:path'; import { TestInvocationLogs, TestStack, invokeFunction, } from '@aws-lambda-powertools/testing-utils'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { LoggerTestNodejsFunction } from '../helpers/resources.js'; import { RESOURCE_NAME_PREFIX, diff --git a/packages/logger/tests/e2e/sampleRate.decorator.test.ts b/packages/logger/tests/e2e/sampleRate.decorator.test.ts index 56f59f266b..011a72d02d 100644 --- a/packages/logger/tests/e2e/sampleRate.decorator.test.ts +++ b/packages/logger/tests/e2e/sampleRate.decorator.test.ts @@ -1,8 +1,3 @@ -/** - * Test logger sample rate feature - * - * @group e2e/logger/sampleRate - */ import { randomUUID } from 'node:crypto'; import { join } from 'node:path'; import { @@ -10,6 +5,7 @@ import { TestStack, invokeFunction, } from '@aws-lambda-powertools/testing-utils'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { LoggerTestNodejsFunction } from '../helpers/resources.js'; import { RESOURCE_NAME_PREFIX,