chore(s3): migrate tests to jest (#10934)

One test was modified because the last argument didn't type check against the nodeunit-shim - here: https://github.com/aws/aws-cdk/blob/2640d9aa06039a6eb539d959d2126749486c7ef3/packages/%40aws-cdk/aws-s3/test/test.bucket.ts#L128-L132 changed to: ```ts test.throws(() => new s3.Bucket(stack, 'MyBucket', { bucketName: bucket, }), expectedErrors); ``` ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Oct 20, 2020 · 585920e · 585920e
1 parent fe6ec39
commit 585920e
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 33 deletions.
diff --git a/packages/@aws-cdk/aws-s3/.gitignore b/packages/@aws-cdk/aws-s3/.gitignore
@@ -15,4 +15,5 @@ nyc.config.js
 *.snk
 !.eslintrc.js
 
-junit.xml
+junit.xml
+!jest.config.js
diff --git a/packages/@aws-cdk/aws-s3/.npmignore b/packages/@aws-cdk/aws-s3/.npmignore
@@ -23,4 +23,5 @@ tsconfig.json
 # exclude cdk artifacts
 **/cdk.out
 junit.xml
-test/
+test/
+jest.config.js
diff --git a/packages/@aws-cdk/aws-s3/jest.config.js b/packages/@aws-cdk/aws-s3/jest.config.js
@@ -0,0 +1,2 @@
+const baseConfig = require('cdk-build-tools/config/jest.config');
+module.exports = baseConfig;
diff --git a/packages/@aws-cdk/aws-s3/package.json b/packages/@aws-cdk/aws-s3/package.json
@@ -56,7 +56,8 @@
     "cloudformation": "AWS::S3",
     "env": {
       "AWSLINT_BASE_CONSTRUCT": "true"
-    }
+    },
+    "jest": true
   },
   "keywords": [
     "aws",
@@ -72,12 +73,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
-    "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",
-    "nodeunit": "^0.11.3",
-    "pkglint": "0.0.0"
+    "pkglint": "0.0.0",
+    "nodeunit-shim": "0.0.0"
   },
   "dependencies": {
     "@aws-cdk/aws-events": "0.0.0",

diff --git a/packages/@aws-cdk/aws-s3/test/test.aspect.ts → packages/@aws-cdk/aws-s3/test/aspect.test.ts b/packages/@aws-cdk/aws-s3/test/test.aspect.ts → packages/@aws-cdk/aws-s3/test/aspect.test.ts
@@ -2,10 +2,10 @@
 import { SynthUtils } from '@aws-cdk/assert';
 import * as cdk from '@aws-cdk/core';
 import { IConstruct } from 'constructs';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as s3 from '../lib';
 
-export = {
+nodeunitShim({
   'bucket must have versioning: failure'(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();
@@ -38,7 +38,7 @@ export = {
 
     test.done();
   },
-};
+});
 
 class BucketVersioningChecker implements cdk.IAspect {
   public visit(node: IConstruct): void {

diff --git a/...aws-cdk/aws-s3/test/test.bucket-policy.ts → ...aws-cdk/aws-s3/test/bucket-policy.test.ts b/...aws-cdk/aws-s3/test/test.bucket-policy.ts → ...aws-cdk/aws-s3/test/bucket-policy.test.ts
@@ -1,13 +1,13 @@
 import { expect, haveResource } from '@aws-cdk/assert';
 import { AnyPrincipal, PolicyStatement } from '@aws-cdk/aws-iam';
 import { RemovalPolicy, Stack, App } from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as s3 from '../lib';
 
 // to make it easy to copy & paste from output:
 /* eslint-disable quote-props */
 
-export = {
+nodeunitShim({
   'default properties'(test: Test) {
     const stack = new Stack();
 
@@ -161,4 +161,4 @@ export = {
 
     test.done();
   },
-};
+});
diff --git a/packages/@aws-cdk/aws-s3/test/test.bucket.ts → packages/@aws-cdk/aws-s3/test/bucket.test.ts b/packages/@aws-cdk/aws-s3/test/test.bucket.ts → packages/@aws-cdk/aws-s3/test/bucket.test.ts
@@ -3,13 +3,13 @@ import { expect, haveResource, haveResourceLike, SynthUtils, arrayWith, objectLi
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';
 import * as cdk from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as s3 from '../lib';
 
 // to make it easy to copy & paste from output:
 /* eslint-disable quote-props */
 
-export = {
+nodeunitShim({
   'default bucket'(test: Test) {
     const stack = new cdk.Stack();
 
@@ -127,9 +127,7 @@ export = {
 
     test.throws(() => new s3.Bucket(stack, 'MyBucket', {
       bucketName: bucket,
-    }), function(err: Error) {
-      return expectedErrors === err.message;
-    });
+    }), expectedErrors);
 
     test.done();
   },
@@ -2250,4 +2248,4 @@ export = {
     test.done();
   },
 
-};
+});
diff --git a/packages/@aws-cdk/aws-s3/test/test.cors.ts → packages/@aws-cdk/aws-s3/test/cors.test.ts b/packages/@aws-cdk/aws-s3/test/test.cors.ts → packages/@aws-cdk/aws-s3/test/cors.test.ts
@@ -1,9 +1,9 @@
 import { expect, haveResource } from '@aws-cdk/assert';
 import { Stack } from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import { Bucket, HttpMethods } from '../lib';
 
-export = {
+nodeunitShim({
   'Can use addCors() to add a CORS configuration'(test: Test) {
     // GIVEN
     const stack = new Stack();
@@ -118,4 +118,4 @@ export = {
 
     test.done();
   },
-};
+});
diff --git a/...ages/@aws-cdk/aws-s3/test/test.metrics.ts → ...ages/@aws-cdk/aws-s3/test/metrics.test.ts b/...ages/@aws-cdk/aws-s3/test/test.metrics.ts → ...ages/@aws-cdk/aws-s3/test/metrics.test.ts
@@ -1,9 +1,9 @@
 import { expect, haveResource } from '@aws-cdk/assert';
 import { Stack } from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import { Bucket } from '../lib';
 
-export = {
+nodeunitShim({
   'Can use addMetrics() to add a metric configuration'(test: Test) {
     // GIVEN
     const stack = new Stack();
@@ -109,4 +109,4 @@ export = {
 
     test.done();
   },
-};
+});
diff --git a/...@aws-cdk/aws-s3/test/test.notification.ts → ...@aws-cdk/aws-s3/test/notification.test.ts b/...@aws-cdk/aws-s3/test/test.notification.ts → ...@aws-cdk/aws-s3/test/notification.test.ts
@@ -1,9 +1,9 @@
 import { expect, haveResource, haveResourceLike, ResourcePart } from '@aws-cdk/assert';
 import * as cdk from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as s3 from '../lib';
 
-export = {
+nodeunitShim({
   'when notification is added a custom s3 bucket notification resource is provisioned'(test: Test) {
     const stack = new cdk.Stack();
 
@@ -133,4 +133,4 @@ export = {
 
     test.done();
   },
-};
+});
diff --git a/packages/@aws-cdk/aws-s3/test/test.rules.ts → packages/@aws-cdk/aws-s3/test/rules.test.ts b/packages/@aws-cdk/aws-s3/test/test.rules.ts → packages/@aws-cdk/aws-s3/test/rules.test.ts
@@ -1,9 +1,9 @@
 import { expect, haveResource } from '@aws-cdk/assert';
 import { Duration, Stack } from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import { Bucket, StorageClass } from '../lib';
 
-export = {
+nodeunitShim({
   'Bucket with expiration days'(test: Test) {
     // GIVEN
     const stack = new Stack();
@@ -128,4 +128,4 @@ export = {
 
     test.done();
   },
-};
+});
diff --git a/packages/@aws-cdk/aws-s3/test/test.util.ts → packages/@aws-cdk/aws-s3/test/util.test.ts b/packages/@aws-cdk/aws-s3/test/test.util.ts → packages/@aws-cdk/aws-s3/test/util.test.ts
@@ -1,8 +1,8 @@
 import * as cdk from '@aws-cdk/core';
-import { Test } from 'nodeunit';
+import { nodeunitShim, Test } from 'nodeunit-shim';
 import { parseBucketArn, parseBucketName } from '../lib/util';
 
-export = {
+nodeunitShim({
   parseBucketArn: {
     'explicit arn'(test: Test) {
       const stack = new cdk.Stack();
@@ -65,4 +65,4 @@ export = {
       test.done();
     },
   },
-};
+});