Release Beta

Author: timdeschryver

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
           key: *cache_key
       - run:
           name: test
-          command: yarn test
+          command: yarn test --maxWorkers=1 --ci
 
   build-lib:
     <<: *job_defaults
@@ -67,7 +67,7 @@ jobs:
           key: *dist_key
       - run:
           name: test
-          command: yarn test:app
+          command: yarn test:app --maxWorkers=1 --ci
 
   release:
     <<: *job_defaults
@@ -81,7 +81,7 @@ jobs:
           name: release
           command: yarn semantic-release || true
 
-  release-next:
+  release-beta:
     <<: *job_defaults
     steps:
       - checkout
@@ -91,7 +91,7 @@ jobs:
           key: *dist_key
       - run:
           name: release
-          command: yarn semantic-release --branch next || true
+          command: yarn semantic-release || true
 
 workflows:
   version: 2
@@ -118,10 +118,10 @@ workflows:
             branches:
               only:
                 - master
-      - release-next:
+      - release-beta:
           requires:
             - test-app
           filters:
             branches:
               only:
-                - next
+                - beta

README.md

@@ -117,20 +117,20 @@ export class CounterComponent {
 counter.component.spec.ts
 
 ```typescript
-import { render } from '@testing-library/angular';
+import { render, screen } from '@testing-library/angular';
 import CounterComponent from './counter.component.ts';
 
 describe('Counter', () => {
   test('should render counter', async () => {
-    const { getByText } = await render(CounterComponent, { componentProperties: { counter: 5 } });
+    await render(CounterComponent, { componentProperties: { counter: 5 } });
 
-    expect(getByText('Current Count: 5'));
+    expect(screen.getByText('Current Count: 5'));
   });
 
   test('should increment the counter on click', async () => {
-    const { getByText, click } = await render(CounterComponent, { componentProperties: { counter: 5 } });
+    const { click } = await render(CounterComponent, { componentProperties: { counter: 5 } });
 
-    click(getByText('+'));
+    click(screen.getByText('+'));
 
     expect(getByText('Current Count: 6'));
   });
@@ -194,6 +194,7 @@ Thanks goes to these people ([emoji key][emojis]):
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors][all-contributors] specification.

angular.json

@@ -13,6 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist/testing-library-app",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -24,6 +25,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -82,7 +89,8 @@
           },
           "configurations": {
             "production": {
-              "project": "projects/testing-library/ng-package.prod.json"
+              "project": "projects/testing-library/ng-package.prod.json",
+              "tsConfig": "projects/testing-library/tsconfig.lib.prod.json"
             }
           }
         },
@@ -109,7 +117,8 @@
           },
           "configurations": {
             "production": {
-              "project": "projects/jest-utils/ng-package.prod.json"
+              "project": "projects/jest-utils/ng-package.prod.json",
+              "tsConfig": "projects/jest-utils/tsconfig.lib.prod.json"
             }
           }
         },

package.json

@@ -22,49 +22,46 @@
       "git add"
     ]
   },
-  "release": {
-    "pkgRoot": "dist/@testing-library/angular"
-  },
   "dependencies": {
-    "@angular/animations": "^8.0.0",
-    "@angular/cdk": "^8.1.4",
-    "@angular/common": "^8.0.0",
-    "@angular/compiler": "^8.0.0",
-    "@angular/core": "^8.0.0",
-    "@angular/forms": "^8.0.0",
-    "@angular/material": "^8.1.4",
-    "@angular/platform-browser": "^8.0.0",
-    "@angular/platform-browser-dynamic": "^8.0.0",
-    "@angular/router": "^8.0.0",
-    "@ngrx/store": "^8.0.0-rc.0",
+    "@angular/animations": "^9.0.3",
+    "@angular/cdk": "^9.1.0",
+    "@angular/common": "^9.0.3",
+    "@angular/compiler": "^9.0.3",
+    "@angular/core": "^9.0.3",
+    "@angular/forms": "^9.0.3",
+    "@angular/material": "^9.1.0",
+    "@angular/platform-browser": "^9.0.3",
+    "@angular/platform-browser-dynamic": "^9.0.3",
+    "@angular/router": "^9.0.3",
+    "@ngrx/store": "^9.0.0-rc.0",
     "@phenomnomnominal/tsquery": "^3.0.0",
-    "@testing-library/dom": "^5.0.1",
+    "@testing-library/dom": "^7.1.1",
+    "@testing-library/user-event": "^8.1.0",
     "core-js": "^3.1.3",
-    "rxjs": "^6.5.2",
+    "rxjs": "^6.5.4",
+    "tslib": "^1.10.0",
     "tslint": "^5.16.0",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.800.0",
-    "@angular-devkit/build-ng-packagr": "~0.800.0",
-    "@angular/cli": "~8.0.0",
-    "@angular/compiler-cli": "^8.0.0",
-    "@angular/language-service": "^8.0.0",
+    "@angular-devkit/build-angular": "~0.900.3",
+    "@angular-devkit/build-ng-packagr": "~0.900.3",
+    "@angular/cli": "~9.0.3",
+    "@angular/compiler-cli": "^9.0.3",
+    "@angular/language-service": "^9.0.3",
     "@testing-library/jest-dom": "^4.1.0",
     "@types/jest": "~24.0.11",
-    "@types/node": "~12.0.3",
-    "codelyzer": "^5.0.1",
+    "@types/node": "^13.7.6",
+    "codelyzer": "^5.1.2",
     "husky": "^2.3.0",
     "jest": "^24.1.0",
     "jest-preset-angular": "^7.1.1",
     "lint-staged": "^8.1.7",
-    "ng-packagr": "^5.2.0",
+    "ng-packagr": "^9.0.0",
     "prettier": "^1.17.1",
     "rimraf": "^2.6.3",
-    "semantic-release": "^15.13.12",
+    "semantic-release": "^17.0.2",
     "ts-node": "~8.2.0",
-    "tsickle": "0.35.0",
-    "tslib": "^1.9.0",
-    "typescript": "~3.4.5"
+    "typescript": "~3.7.5"
   }
 }

projects/jest-utils/src/lib/configure-test-suite.ts

@@ -1,2 +1 @@
-export * from './configure-test-suite';
 export * from './create-mock';

projects/jest-utils/src/lib/index.ts

@@ -35,7 +35,7 @@ it('provides a mock service', async () => {
   const { click, getByText } = await render(FixtureComponent, {
     providers: [provideMock(FixtureService)],
   });
-  const service = TestBed.get<FixtureService>(FixtureService);
+  const service = TestBed.inject(FixtureService);
 
   click(getByText('Print'));
   expect(service.print).toHaveBeenCalledTimes(1);
@@ -46,7 +46,7 @@ it('is possible to write a mock implementation', async done => {
     providers: [provideMock(FixtureService)],
   });
 
-  const service = TestBed.get<FixtureService>(FixtureService) as Mock<FixtureService>;
+  const service = TestBed.inject(FixtureService) as Mock<FixtureService>;
   service.print.mockImplementation(() => done());
 
   click(getByText('Print'));

projects/jest-utils/tests/create-mock.spec.ts

@@ -12,11 +12,10 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "allowSyntheticDefaultImports": true,
-    "types": [],
+    "types": ["@types/jest"],
     "lib": ["dom", "es2015"]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,

projects/jest-utils/tsconfig.lib.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}

projects/jest-utils/tsconfig.lib.prod.json

@@ -5,5 +5,10 @@
   "lib": {
     "entryFile": "src/public_api.ts"
   },
-  "whitelistedNonPeerDependencies": ["@testing-library/dom", "@phenomnomnominal/tsquery", "tslint"]
+  "whitelistedNonPeerDependencies": [
+    "@testing-library/dom",
+    "@testing-library/user-event",
+    "@phenomnomnominal/tsquery",
+    "tslint"
+  ]
 }

projects/testing-library/ng-package.json

@@ -5,5 +5,10 @@
   "lib": {
     "entryFile": "src/public_api.ts"
   },
-  "whitelistedNonPeerDependencies": ["@testing-library/dom", "@phenomnomnominal/tsquery", "tslint"]
+  "whitelistedNonPeerDependencies": [
+    "@testing-library/dom",
+    "@testing-library/user-event",
+    "@phenomnomnominal/tsquery",
+    "tslint"
+  ]
 }

projects/testing-library/ng-package.prod.json

@@ -22,14 +22,15 @@
   },
   "homepage": "https://github.com/testing-library/angular-testing-library#readme",
   "peerDependencies": {
-    "@angular/common": "^8.0.0",
-    "@angular/platform-browser": "^8.0.0",
-    "@angular/animations": "^8.0.0",
-    "@angular/router": "^8.0.0",
-    "@angular/core": "^8.0.0"
+    "@angular/common": "^9.0.0",
+    "@angular/platform-browser": "^9.0.0",
+    "@angular/animations": "^9.0.0",
+    "@angular/router": "^9.0.0",
+    "@angular/core": "^9.0.0"
   },
   "dependencies": {
-    "@testing-library/dom": "^5.1.0",
+    "@testing-library/dom": "^7.1.0",
+    "@testing-library/user-event": "^8.1.0",
     "@phenomnomnominal/tsquery": "^3.0.0",
     "tslint": "^5.16.0"
   },

projects/testing-library/package.json

@@ -1,15 +1,7 @@
 import { Type, DebugElement } from '@angular/core';
 import { ComponentFixture } from '@angular/core/testing';
 import { Routes } from '@angular/router';
-import {
-  BoundFunction,
-  FireObject,
-  Queries,
-  queries,
-  waitForElement,
-  waitForElementToBeRemoved,
-  waitForDomChange,
-} from '@testing-library/dom';
+import { BoundFunction, FireObject, Queries, queries, waitFor, waitForElementToBeRemoved } from '@testing-library/dom';
 import { UserEvents } from './user-events';
 
 export type RenderResultQueries<Q extends Queries = typeof queries> = { [P in keyof Q]: BoundFunction<Q[P]> };
@@ -68,25 +60,18 @@ export interface RenderResult<ComponentType, WrapperType = ComponentType>
   rerender: (componentProperties: Partial<ComponentType>) => void;
   /**
    * @description
-   * Wait for the DOM to change.
-   *
-   * For more info see https://testing-library.com/docs/dom-testing-library/api-async#waitfordomchange
-   */
-  waitForDomChange: typeof waitForDomChange;
-  /**
-   * @description
-   * Wait for DOM elements to appear, disappear, or change.
+   * Wait for the removal of element(s) from the DOM.
    *
-   * For more info see https://testing-library.com/docs/dom-testing-library/api-async#waitforelement
+   * For more info see https://testing-library.com/docs/dom-testing-library/api-async#waitforelementtoberemoved
    */
-  waitForElement: typeof waitForElement;
+  waitForElementToBeRemoved: typeof waitForElementToBeRemoved;
   /**
    * @description
-   * Wait for the removal of element(s) from the DOM.
+   * When in need to wait for any period of time you can use waitFor, to wait for your expectations to pass.
    *
-   * For more info see https://testing-library.com/docs/dom-testing-library/api-async#waitforelementtoberemoved
+   * For more info see https://testing-library.com/docs/dom-testing-library/api-async#waitFor
    */
-  waitForElementToBeRemoved: typeof waitForElementToBeRemoved;
+  waitFor: typeof waitFor;
 }
 
 export interface RenderComponentOptions<ComponentType, Q extends Queries = typeof queries> {
@@ -263,6 +248,20 @@ export interface RenderComponentOptions<ComponentType, Q extends Queries = typeo
    * })
    */
   routes?: Routes;
+
+  /**
+   * @description
+   * Removes the Angular attributes (ng-version, and root-id) from the fixture.
+   *
+   * @default
+   * `false`
+   *
+   * @example
+   * const component = await render(AppComponent, {
+   *  removeAngularAttributes: true
+   * })
+   */
+  removeAngularAttributes?: boolean;
 }
 
 export interface RenderDirectiveOptions<DirectiveType, WrapperType, Q extends Queries = typeof queries>