From a263e68a83f747caab78e63b208d31c1c4a5d195 Mon Sep 17 00:00:00 2001 From: amitmiran137 Date: Wed, 5 May 2021 10:35:28 +0300 Subject: [PATCH] chore: rename proj. from master to main --- .github/workflows/release.yml | 2 +- README.md | 14 +++++++------- apps/example-app/src/app/examples/09-router.ts | 2 +- nx.json | 2 +- .../testing-library/src/lib/testing-library.ts | 2 +- release.config.js | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0370418d..bf5a1886 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: release on: push: branches: - - master + - main jobs: release: diff --git a/README.md b/README.md index b542de69..bf186cbb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ height="80" width="80" alt="hedgehog" - src="https://raw.githubusercontent.com/testing-library/angular-testing-library/master/other/hedgehog.png" + src="https://raw.githubusercontent.com/testing-library/angular-testing-library/main/other/hedgehog.png" /> @@ -43,7 +43,7 @@ practices.

TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application. @@ -139,7 +139,7 @@ describe('Counter', () => { }); ``` -[See more examples](https://github.com/testing-library/angular-testing-library/tree/master/apps/example-app/src/app/examples) +[See more examples](https://github.com/testing-library/angular-testing-library/tree/main/apps/example-app/src/app/examples) ## Installation @@ -270,8 +270,8 @@ Links: [npm]: https://www.npmjs.com/ [node]: https://nodejs.org -[build-badge]: https://circleci.com/gh/testing-library/angular-testing-library/tree/master.svg?style=shield -[build]: https://circleci.com/gh/testing-library/angular-testing-library/tree/master +[build-badge]: https://circleci.com/gh/testing-library/angular-testing-library/tree/main.svg?style=shield +[build]: https://circleci.com/gh/testing-library/angular-testing-library/tree/main [coverage]: https://codecov.io/github/testing-library/angular-testing-library [coverage-badge]: https://img.shields.io/codecov/c/github/testing-library/angular-testing-library.svg?style=flat-square [version-badge]: https://img.shields.io/npm/v/@testing-library/angular.svg?style=flat-square @@ -281,12 +281,12 @@ Links: [discord-badge]: https://img.shields.io/discord/723559267868737556.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square [discord]: https://discord.gg/testing-library [license-badge]: https://img.shields.io/npm/l/@testing-library/angular.svg?style=flat-square -[license]: https://github.com/testing-library/angular-testing-library/blob/master/LICENSE +[license]: https://github.com/testing-library/angular-testing-library/blob/main/LICENSE [prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square [prs]: http://makeapullrequest.com [donate-badge]: https://img.shields.io/badge/$-support-green.svg?style=flat-square [coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square -[coc]: https://github.com/testing-library/angular-testing-library/blob/master/CODE_OF_CONDUCT.md +[coc]: https://github.com/testing-library/angular-testing-library/blob/main/CODE_OF_CONDUCT.md [github-watch-badge]: https://img.shields.io/github/watchers/testing-library/angular-testing-library.svg?style=social [github-watch]: https://github.com/testing-library/angular-testing-library/watchers [github-star-badge]: https://img.shields.io/github/stars/testing-library/angular-testing-library.svg?style=social diff --git a/apps/example-app/src/app/examples/09-router.ts b/apps/example-app/src/app/examples/09-router.ts index 035124c8..7d4e300d 100644 --- a/apps/example-app/src/app/examples/09-router.ts +++ b/apps/example-app/src/app/examples/09-router.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { map } from 'rxjs/operators'; @Component({ - selector: 'app-master', + selector: 'app-main', template: ` Load one | Load two | Load three | diff --git a/nx.json b/nx.json index c99139c8..132d0c91 100644 --- a/nx.json +++ b/nx.json @@ -10,7 +10,7 @@ "nx.json": "*" }, "affected": { - "defaultBase": "master" + "defaultBase": "main" }, "npmScope": "testing-library", "tasksRunnerOptions": { diff --git a/projects/testing-library/src/lib/testing-library.ts b/projects/testing-library/src/lib/testing-library.ts index b02c905d..3c3b86f7 100644 --- a/projects/testing-library/src/lib/testing-library.ts +++ b/projects/testing-library/src/lib/testing-library.ts @@ -371,7 +371,7 @@ function replaceFindWithFindAndDetectChanges(originalQueriesForContainer: T): const getByQuery = originalQueriesForContainer[key.replace('find', 'get')]; if (key.startsWith('find') && getByQuery) { newQueries[key] = async (text, options, waitOptions) => { - // original implementation at https://github.com/testing-library/dom-testing-library/blob/master/src/query-helpers.js + // original implementation at https://github.com/testing-library/dom-testing-library/blob/main/src/query-helpers.js const result = await waitForWrapper( detectChangesForMountedFixtures, () => getByQuery(text, options), diff --git a/release.config.js b/release.config.js index 9c0c79a3..3bf46c17 100644 --- a/release.config.js +++ b/release.config.js @@ -1,4 +1,4 @@ module.exports = { pkgRoot: 'dist/@testing-library/angular', - branches: ['master', { name: 'beta', prerelease: true }], + branches: ['main', { name: 'beta', prerelease: true }], };