+
@@ -140,7 +113,6 @@ exports[`SpriteSelectorItemComponent matches snapshot when selected 1`] = `
className=""
>
diff --git a/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx b/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
index cdf51514a1..b6efd5c701 100644
--- a/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
@@ -60,9 +60,10 @@ describe('ProjectFetcherHOC', () => {
);
storage.load = originalLoad;
// nextTick needed since storage.load is async, and onFetchedProject is called in its then()
- process.nextTick(
+ setTimeout(
() => expect(mockedOnFetchedProject)
- .toHaveBeenLastCalledWith('100', LoadingState.FETCHING_WITH_ID)
+ .toHaveBeenLastCalledWith('100', LoadingState.FETCHING_WITH_ID),
+ 1
);
});
});
diff --git a/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx b/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
index 55b571af6f..6395c0eb44 100644
--- a/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
@@ -150,9 +150,9 @@ describe('VMManagerHOC', () => {
});
expect(vm.loadProject).toHaveBeenLastCalledWith('100');
// nextTick needed since vm.loadProject is async, and we have to wait for it :/
- process.nextTick(() => (
+ setTimeout(() => (
expect(mockedOnLoadedProject).toHaveBeenLastCalledWith(LoadingState.LOADING_VM_WITH_ID, true)
- ));
+ ), 1);
});
test('if the fontsLoaded prop becomes true, it loads project data into the vm', () => {
vm.loadProject = jest.fn(() => Promise.resolve());
@@ -175,9 +175,9 @@ describe('VMManagerHOC', () => {
});
expect(vm.loadProject).toHaveBeenLastCalledWith('100');
// nextTick needed since vm.loadProject is async, and we have to wait for it :/
- process.nextTick(() => (
+ setTimeout(() => (
expect(mockedOnLoadedProject).toHaveBeenLastCalledWith(LoadingState.LOADING_VM_WITH_ID, false)
- ));
+ ), 1);
});
test('if the fontsLoaded prop is false, project data is never loaded', () => {
vm.loadProject = jest.fn(() => Promise.resolve());
@@ -197,6 +197,6 @@ describe('VMManagerHOC', () => {
projectData: '100'
});
expect(vm.loadProject).toHaveBeenCalledTimes(0);
- process.nextTick(() => expect(mockedOnLoadedProject).toHaveBeenCalledTimes(0));
+ setTimeout(() => expect(mockedOnLoadedProject).toHaveBeenCalledTimes(0), 1);
});
});
From 43c223355b185e7686eacb6f5c3ece91b8ee7d27 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Wed, 24 Sep 2025 08:23:06 -0700
Subject: [PATCH 8/8] test: fix detect-locale test with mock window
---
.../test/unit/util/detect-locale.test.js | 85 +++++++++----------
1 file changed, 41 insertions(+), 44 deletions(-)
diff --git a/packages/scratch-gui/test/unit/util/detect-locale.test.js b/packages/scratch-gui/test/unit/util/detect-locale.test.js
index f9b1f63fce..51bb19b6ae 100644
--- a/packages/scratch-gui/test/unit/util/detect-locale.test.js
+++ b/packages/scratch-gui/test/unit/util/detect-locale.test.js
@@ -2,85 +2,82 @@ import {detectLocale} from '../../../src/lib/detect-locale.js';
const supportedLocales = ['en', 'es', 'pt-br', 'de', 'it'];
-Object.defineProperty(window.location,
- 'search',
- {value: '?name=val', configurable: true}
-);
-Object.defineProperty(window.navigator,
- 'language',
- {value: 'en-US', configurable: true}
-);
+/**
+ * @type {jest.SpyInstance}
+ */
+let windowSpy;
+
+/**
+ * @type {jest.SpyInstance}
+ */
+let locationSpy;
+
+const mockWindowLocation = new URL('http://example.com/?name=val');
+const mockWindowNavigator = {
+ language: 'en-US'
+};
+
+beforeEach(() => {
+ windowSpy = jest.spyOn(global, 'window', 'get');
+ locationSpy = jest.spyOn(global, 'location', 'get');
+
+ windowSpy.mockImplementation(() => ({
+ location: mockWindowLocation,
+ navigator: mockWindowNavigator
+ }));
+
+ // `window.location` and `location` should point to the same object
+ locationSpy.mockImplementation(() => mockWindowLocation);
+});
+
+afterEach(() => {
+ windowSpy.mockRestore();
+ locationSpy.mockRestore();
+});
describe('detectLocale', () => {
test('uses locale from the URL when present', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=pt-br'}
- );
+ mockWindowLocation.search = '?locale=pt-br';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('is case insensitive', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=pt-BR'}
- );
+ mockWindowLocation.search = '?locale=pt-BR';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('also accepts lang from the URL when present', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?lang=it'}
- );
+ mockWindowLocation.search = '?lang=it';
expect(detectLocale(supportedLocales)).toEqual('it');
});
test('ignores unsupported locales', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?lang=sv'}
- );
+ mockWindowLocation.search = '?lang=sv';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('ignores other parameters', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?enable=language'}
- );
+ mockWindowLocation.search = '?enable=language';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('uses navigator language property for default if supported', () => {
- Object.defineProperty(window.navigator,
- 'language',
- {value: 'pt-BR'}
- );
+ mockWindowNavigator.language = 'pt-BR';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('ignores navigator language property if unsupported', () => {
- Object.defineProperty(window.navigator,
- 'language',
- {value: 'da'}
- );
+ mockWindowNavigator.language = 'da';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('works with an empty locale', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale='}
- );
+ mockWindowLocation.search = '?locale=';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('if multiple, uses the first locale', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=de&locale=en'}
- );
+ mockWindowLocation.search = '?locale=de&locale=en';
expect(detectLocale(supportedLocales)).toEqual('de');
});
});