Skip to content

Commit

Permalink
build(devs-infra): configure CI and doc to point to main (#996)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahnpnl authored Sep 16, 2021
1 parent 96212bf commit 77bfa95
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- First of all, check the troubleshooting section for common issues at:
https://github.com/thymikee/jest-preset-angular/blob/master/README.md#troubleshooting -->
https://github.com/thymikee/jest-preset-angular/blob/main/README.md#troubleshooting -->

## 👉 [Please follow one of these issue templates](https://github.com/thymikee/jest-preset-angular/issues/new/choose) 👈

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: doc-generator

on:
push:
branches: [master]
branches: [main]
pull_request:
branches:
- '**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Node CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- '**'
Expand All @@ -15,7 +15,7 @@ jobs:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"

prepare-yarn-cache:
name: Prepare yarn cache
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<p align="center">A preset of Jest configuration for Angular projects.</p>

<p align="center">
<a href="https://actions-badge.atrox.dev/thymikee/jest-preset-angular/goto?ref=master"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fthymikee%2Fjest-preset-angular%2Fbadge%3Fref%3Dmaster&style=flat-square" /></a>
<a href="https://actions-badge.atrox.dev/thymikee/jest-preset-angular/goto?ref=main"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fthymikee%2Fjest-preset-angular%2Fbadge%3Fref%3Dmain&style=flat-square" /></a>
<a href="https://www.npmjs.com/package/jest-preset-angular"><img src="https://img.shields.io/npm/v/jest-preset-angular/latest.svg?style=flat-square" alt="NPM Version" /></a>
<a href="https://github.com/thymikee/jest-preset-angular/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/jest-preset-angular.svg?style=flat-square" alt="GitHub license" /></a>
<a href="https://github.com/thymikee/jest-preset-angular/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/jest-preset-angular.svg?style=flat-square" alt="GitHub license" /></a>
</p>

This is a part of the article: [Testing Angular faster with Jest](https://www.xfive.co/blog/testing-angular-faster-jest/).
Expand Down Expand Up @@ -77,7 +77,7 @@ Check out our [Angular Ivy guidance](https://thymikee.github.io/jest-preset-angu

## Example apps

We have [example apps](https://github.com/thymikee/jest-preset-angular/tree/master/examples) to provide a basic setup to use Jest in an Angular project.
We have [example apps](https://github.com/thymikee/jest-preset-angular/tree/main/examples) to provide a basic setup to use Jest in an Angular project.

## Built With

Expand Down
4 changes: 2 additions & 2 deletions website/docs/getting-started/test-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ id: test-environment
title: Test environment
---

If you look at [`setup-jest.ts`](https://github.com/thymikee/jest-preset-angular/blob/master/src/config/setup-jest.ts),
what we're doing here is we're adding globals required by Angular. With the included [jest-zone-patch](https://github.com/thymikee/jest-preset-angular/tree/master/src/zone-patch)
If you look at [`setup-jest.ts`](https://github.com/thymikee/jest-preset-angular/blob/main/src/config/setup-jest.ts),
what we're doing here is we're adding globals required by Angular. With the included [jest-zone-patch](https://github.com/thymikee/jest-preset-angular/tree/main/src/zone-patch)
we also make sure Jest test methods run in Zone context. Then we initialize the Angular testing environment like normal.
2 changes: 1 addition & 1 deletion website/docs/guides/jsdom-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ package, e.g. `jest-environment-jsdom-sixteen` and edit your Jest config like so

If you use JSDOM v11 or lower, you might have to mock `localStorage` or `sessionStorage` on your own or using some third-party library by loading it in `setupFilesAfterEnv`.

Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/master/Changelog.md#1200
Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/main/Changelog.md#1200
2 changes: 1 addition & 1 deletion website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module.exports = {
{
docs: {
sidebarPath: require.resolve('./sidebars.js'),
editUrl: 'https://github.com/thymikee/jest-preset-angular/edit/master/website',
editUrl: 'https://github.com/thymikee/jest-preset-angular/edit/main/website',
},
theme: {
customCss: require.resolve('./src/css/custom.css'),
Expand Down
6 changes: 3 additions & 3 deletions website/src/pages/versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Version() {
<Link to={nextVersion.path}>Documentation</Link>
</td>
<td>
<a href={`${repoUrl}/blob/master/CHANGELOG.md`}>Release Notes</a>
<a href={`${repoUrl}/blob/main/CHANGELOG.md`}>Release Notes</a>
</td>
</tr>
</tbody>
Expand All @@ -55,7 +55,7 @@ function Version() {
<Link to={latestVersion.path}>Documentation</Link>
</td>
<td>
<a href={`${repoUrl}/blob/master/CHANGELOG.md`}>Release Notes</a>
<a href={`${repoUrl}/blob/main/CHANGELOG.md`}>Release Notes</a>
</td>
</tr>
</tbody>
Expand All @@ -75,7 +75,7 @@ function Version() {
<Link to={version.path}>Documentation</Link>
</td>
<td>
<a href={`${repoUrl}/blob/master/CHANGELOG.md`}>Release Notes</a>
<a href={`${repoUrl}/blob/main/CHANGELOG.md`}>Release Notes</a>
</td>
</tr>
))}
Expand Down
2 changes: 1 addition & 1 deletion website/versioned_docs/version-8.x/guides/jsdom-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ package, e.g. `jest-environment-jsdom-sixteen` and edit your Jest config like so

If you use JSDOM v11 or lower, you might have to mock `localStorage` or `sessionStorage` on your own or using some third-party library by loading it in `setupFilesAfterEnv`.

Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/master/Changelog.md#1200
Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/main/Changelog.md#1200
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ id: test-environment
title: Test environment
---

If you look at [`setup-jest.ts`](https://github.com/thymikee/jest-preset-angular/blob/master/src/config/setup-jest.ts),
what we're doing here is we're adding globals required by Angular. With the included [jest-zone-patch](https://github.com/thymikee/jest-preset-angular/tree/master/src/zone-patch)
If you look at [`setup-jest.ts`](https://github.com/thymikee/jest-preset-angular/blob/main/src/config/setup-jest.ts),
what we're doing here is we're adding globals required by Angular. With the included [jest-zone-patch](https://github.com/thymikee/jest-preset-angular/tree/main/src/zone-patch)
we also make sure Jest test methods run in Zone context. Then we initialize the Angular testing environment like normal.
2 changes: 1 addition & 1 deletion website/versioned_docs/version-9.x/guides/jsdom-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ package, e.g. `jest-environment-jsdom-sixteen` and edit your Jest config like so

If you use JSDOM v11 or lower, you might have to mock `localStorage` or `sessionStorage` on your own or using some third-party library by loading it in `setupFilesAfterEnv`.

Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/master/Changelog.md#1200
Reference: https://jestjs.io/docs/en/configuration.html#testenvironment-string, https://github.com/jsdom/jsdom/blob/main/Changelog.md#1200

0 comments on commit 77bfa95

Please sign in to comment.