Skip to content

Commit

Permalink
fix: use browser.isolate instead of config.isolate (#7560)
Browse files Browse the repository at this point in the history
  • Loading branch information
sheremet-va authored Feb 26, 2025
1 parent e2c570b commit 4b5ed90
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/browser/src/client/orchestrator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class IframeOrchestrator {
this.iframes.forEach(iframe => iframe.remove())
this.iframes.clear()

if (config.isolate === false) {
if (config.browser.isolate === false) {
debug('create iframe', ID_ALL)
const iframe = this.createIframe(container, ID_ALL)

Expand Down
8 changes: 5 additions & 3 deletions test/browser/test/dom.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { createNode } from '#src/createNode'
import { page } from '@vitest/browser/context'
import { beforeEach, describe, expect, test } from 'vitest'
import { afterAll, beforeEach, describe, expect, test } from 'vitest'
import '../src/button.css'

afterAll(() => {
document.body.removeAttribute('style')
})

describe('dom related activity', () => {
beforeEach(() => {
document.body.style.background = '#f3f3f3'
document.body.replaceChildren()
})

Expand Down Expand Up @@ -101,7 +104,6 @@ describe('dom related activity', () => {
})

function createWrapper() {
document.body.style.background = '#f3f3f3'
const wrapper = document.createElement('div')
wrapper.className = 'wrapper'
document.body.appendChild(wrapper)
Expand Down
7 changes: 6 additions & 1 deletion test/browser/test/viewport.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { server } from '@vitest/browser/context'
import { describe, expect, it } from 'vitest'

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

0 comments on commit 4b5ed90

Please sign in to comment.