Skip to content

Commit 4b5ed90

Browse files
authored
fix: use browser.isolate instead of config.isolate (#7560)
1 parent e2c570b commit 4b5ed90

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

packages/browser/src/client/orchestrator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class IframeOrchestrator {
4949
this.iframes.forEach(iframe => iframe.remove())
5050
this.iframes.clear()
5151

52-
if (config.isolate === false) {
52+
if (config.browser.isolate === false) {
5353
debug('create iframe', ID_ALL)
5454
const iframe = this.createIframe(container, ID_ALL)
5555

test/browser/test/dom.test.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { createNode } from '#src/createNode'
22
import { page } from '@vitest/browser/context'
3-
import { beforeEach, describe, expect, test } from 'vitest'
3+
import { afterAll, beforeEach, describe, expect, test } from 'vitest'
44
import '../src/button.css'
55

6+
afterAll(() => {
7+
document.body.removeAttribute('style')
8+
})
9+
610
describe('dom related activity', () => {
711
beforeEach(() => {
8-
document.body.style.background = '#f3f3f3'
912
document.body.replaceChildren()
1013
})
1114

@@ -101,7 +104,6 @@ describe('dom related activity', () => {
101104
})
102105

103106
function createWrapper() {
104-
document.body.style.background = '#f3f3f3'
105107
const wrapper = document.createElement('div')
106108
wrapper.className = 'wrapper'
107109
document.body.appendChild(wrapper)

test/browser/test/viewport.test.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import { server } from '@vitest/browser/context'
22
import { describe, expect, it } from 'vitest'
33

4-
describe.skipIf(server.provider === 'preview')('viewport window has been properly initialized', () => {
4+
describe.skipIf(
5+
// preview cannot control viewport
6+
server.provider === 'preview'
7+
// other tests affect the viewport if they run in a different order
8+
|| server.config.browser.isolate === false,
9+
)('viewport window has been properly initialized', () => {
510
it.skipIf(!server.config.browser.headless)('viewport has proper size', () => {
611
const { width, height } = server.config.browser.viewport
712
const { width: actualWidth, height: actualHeight } = window.document.documentElement.getBoundingClientRect()

0 commit comments

Comments
 (0)