Skip to content

Commit e00c071

Browse files
committed
run prettier
1 parent 8565cb0 commit e00c071

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/testing/jest/jest-28/jest-environment.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ export function createJestPuppeteerEnvironment(): JestPuppeteerEnvironmentConstr
1515
testPath: string | null = null;
1616

1717
constructor(config: any, context: any) {
18+
<<<<<<< HEAD
19+
=======
20+
//@ts-ignore
21+
>>>>>>> 5062ed640 (run prettier)
1822
super(config, context);
1923
this.testPath = context.testPath;
2024
}

src/testing/jest/jest-29/jest-runner.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ export function createTestRunner(): JestTestRunnerConstructor {
8080
} else {
8181
// not doing e2e screenshot tests
8282
// so just run each test once
83+
<<<<<<< HEAD
84+
=======
85+
//@ts-ignore
86+
>>>>>>> 5062ed640 (run prettier)
8387
await super.runTests(tests, watcher, options);
8488
}
8589
}

test/end-to-end/src/declarative-shadow-dom/test.e2e.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ describe('renderToString', () => {
377377
});
378378

379379
describe('hydrateDocument', () => {
380-
381380
it('can hydrate components with open shadow dom by default', async () => {
382381
const { html } = await hydrateDocument('<another-car-detail></another-car-detail>', {
383382
fullDocument: false,
@@ -394,8 +393,5 @@ describe('renderToString', () => {
394393
expect(html).toContain('s-id="');
395394
expect(html).not.toContain('shadowrootmode="open"');
396395
});
397-
398-
399396
});
400-
401397
});

0 commit comments

Comments
 (0)