Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: only replace find query if they got a get query #151

Merged
merged 1 commit into from
Oct 16, 2020
Merged

fix: only replace find query if they got a get query #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
- name: install
run: npm install
- name: build
run: npm run build --skip-nx-cache
run: npm run build -- --skip-nx-cache
- name: test
run: npm run test --ci --code-coverage
run: npm run test -- --ci --code-coverage
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- name: install
run: npm install
- name: build
run: npm run build --skip-nx-cache
run: npm run build -- --skip-nx-cache
- name: test
run: npm run test --ci --code-coverage
run: npm run test -- --ci --code-coverage
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "nx run-many --target=build --all",
"build": "nx run-many --target=build --projects=testing-library,jest-utils",
"test": "nx run-many --target=test --all",
"lint": "nx workspace-lint && ng lint",
"e2e": "ng e2e",
Expand Down
15 changes: 6 additions & 9 deletions projects/testing-library/src/lib/testing-library.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export async function render<SutType, WrapperType = SutType>(
detectChanges();
};

const inject = TestBed.inject || TestBed.get
const inject = TestBed.inject || TestBed.get;
let router = routes ? inject(Router) : null;
const zone = inject(NgZone);
const navigate = async (elementOrPath: Element | string, basePath = '') => {
Expand Down Expand Up @@ -167,10 +167,7 @@ export async function render<SutType, WrapperType = SutType>(
Array.isArray(element)
? element.forEach((e) => console.log(dtlPrettyDOM(e, maxLength, options)))
: console.log(dtlPrettyDOM(element, maxLength, options)),
...replaceFindWithFindAndDetectChanges(
fixture.nativeElement,
dtlGetQueriesForElement(fixture.nativeElement, queries),
),
...replaceFindWithFindAndDetectChanges(dtlGetQueriesForElement(fixture.nativeElement, queries)),
};
}

Expand Down Expand Up @@ -315,10 +312,10 @@ class WrapperComponent {}
/**
* Wrap findBy queries to poke the Angular change detection cycle
*/
function replaceFindWithFindAndDetectChanges<T>(container: HTMLElement, originalQueriesForContainer: T): T {
function replaceFindWithFindAndDetectChanges<T>(originalQueriesForContainer: T): T {
return Object.keys(originalQueriesForContainer).reduce((newQueries, key) => {
if (key.startsWith('find')) {
const getByQuery = originalQueriesForContainer[key.replace('find', 'get')];
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
const result = await waitForWrapper(
Expand Down Expand Up @@ -354,7 +351,7 @@ function detectChangesForMountedFixtures() {
/**
* Re-export screen with patched queries
*/
const screen = replaceFindWithFindAndDetectChanges(document.body, dtlScreen);
const screen = replaceFindWithFindAndDetectChanges(dtlScreen);

/**
* Re-export waitFor with patched waitFor
Expand Down