chore(ecr): migrate tests to jest (aws#12620)

* use native jest API like what aws#12596 did * move `removal policy is "Retain" by default` & `'grant adds appropriate resource-*'` tests out of `events` scope in `repository.test.ts`, which I believe they were misplaced I'm doing this partially because I would like to implement the feature proposed in aws#12618. It would be easier to mock `aws-sdk` function calls with jest. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
john-tipper · May 10, 2021 · 86a9268 · 86a9268
1 parent 006e0dc
commit 86a9268
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 150 deletions.
diff --git a/packages/@aws-cdk/aws-ecr/.gitignore b/packages/@aws-cdk/aws-ecr/.gitignore
@@ -14,5 +14,6 @@ nyc.config.js
 .LAST_PACKAGE
 *.snk
 !.eslintrc.js
+!jest.config.js
 
-junit.xml
+junit.xml
diff --git a/packages/@aws-cdk/aws-ecr/.npmignore b/packages/@aws-cdk/aws-ecr/.npmignore
@@ -19,8 +19,9 @@ dist
 
 tsconfig.json
 .eslintrc.js
+jest.config.js
 
 # exclude cdk artifacts
 **/cdk.out
 junit.xml
-test/
+test/
diff --git a/packages/@aws-cdk/aws-ecr/jest.config.js b/packages/@aws-cdk/aws-ecr/jest.config.js
@@ -0,0 +1,10 @@
+const baseConfig = require('cdk-build-tools/config/jest.config');
+module.exports = {
+  ...baseConfig,
+  coverageThreshold: {
+    global: {
+      ...baseConfig.coverageThreshold.global,
+      branches: 70,
+    },
+  },
+};
diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json
@@ -55,7 +55,8 @@
     "cloudformation": "AWS::ECR",
     "env": {
       "AWSLINT_BASE_CONSTRUCT": true
-    }
+    },
+    "jest": true
   },
   "nyc": {
     "lines": 78,
@@ -74,13 +75,11 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/nodeunit": "^0.0.31",
+    "@aws-cdk/assert-internal": "0.0.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",
-    "nodeunit": "^0.11.3",
-    "pkglint": "0.0.0",
-    "@aws-cdk/assert-internal": "0.0.0"
+    "pkglint": "0.0.0"
   },
   "dependencies": {
     "@aws-cdk/aws-events": "0.0.0",

diff --git a/.../@aws-cdk/aws-ecr/test/test.auth-token.ts → .../@aws-cdk/aws-ecr/test/auth-token.test.ts b/.../@aws-cdk/aws-ecr/test/test.auth-token.ts → .../@aws-cdk/aws-ecr/test/auth-token.test.ts
@@ -1,11 +1,10 @@
-import { expect, haveResourceLike } from '@aws-cdk/assert-internal';
+import { expect as expectCDK, haveResourceLike } from '@aws-cdk/assert-internal';
 import * as iam from '@aws-cdk/aws-iam';
 import { Stack } from '@aws-cdk/core';
-import { Test } from 'nodeunit';
 import { AuthorizationToken, PublicGalleryAuthorizationToken } from '../lib';
 
-export = {
-  'AuthorizationToken.grantRead()'(test: Test) {
+describe('auth-token', () => {
+  test('AuthorizationToken.grantRead()', () => {
     // GIVEN
     const stack = new Stack();
     const user = new iam.User(stack, 'User');
@@ -14,7 +13,7 @@ export = {
     AuthorizationToken.grantRead(user);
 
     // THEN
-    expect(stack).to(haveResourceLike('AWS::IAM::Policy', {
+    expectCDK(stack).to(haveResourceLike('AWS::IAM::Policy', {
       PolicyDocument: {
         Statement: [
           {
@@ -25,11 +24,9 @@ export = {
         ],
       },
     }));
+  });
 
-    test.done();
-  },
-
-  'PublicGalleryAuthorizationToken.grantRead()'(test: Test) {
+  test('PublicGalleryAuthorizationToken.grantRead()', () => {
     // GIVEN
     const stack = new Stack();
     const user = new iam.User(stack, 'User');
@@ -38,7 +35,7 @@ export = {
     PublicGalleryAuthorizationToken.grantRead(user);
 
     // THEN
-    expect(stack).to(haveResourceLike('AWS::IAM::Policy', {
+    expectCDK(stack).to(haveResourceLike('AWS::IAM::Policy', {
       PolicyDocument: {
         Statement: [
           {
@@ -52,8 +49,5 @@ export = {
         ],
       },
     }));
-
-    test.done();
-  },
-
-};
+  });
+});