Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: release
on:
push:
branches:
- master
- main

jobs:
release:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
</a>

Expand Down Expand Up @@ -43,7 +43,7 @@ practices.</p>
<img
width="500"
alt="TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application."
src="https://raw.githubusercontent.com/testing-library/react-testing-library/master/other/testingjavascript.jpg"
src="https://raw.githubusercontent.com/testing-library/react-testing-library/main/other/testingjavascript.jpg"
/>
</a>
</div>
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/example-app/src/app/examples/09-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import { map } from 'rxjs/operators';

@Component({
selector: 'app-master',
selector: 'app-main',
template: `
<a [routerLink]="'./detail/one'">Load one</a> | <a [routerLink]="'./detail/two'">Load two</a> |
<a [routerLink]="'./detail/three'">Load three</a> |
Expand Down
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"nx.json": "*"
},
"affected": {
"defaultBase": "master"
"defaultBase": "main"
},
"npmScope": "testing-library",
"tasksRunnerOptions": {
Expand Down
2 changes: 1 addition & 1 deletion projects/testing-library/src/lib/testing-library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function replaceFindWithFindAndDetectChanges<T>(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),
Expand Down
2 changes: 1 addition & 1 deletion release.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
pkgRoot: 'dist/@testing-library/angular',
branches: ['master', { name: 'beta', prerelease: true }],
branches: ['main', { name: 'beta', prerelease: true }],
};