Skip to content

Commit 6da3182

Browse files
ZmyslnyZmyslny
committed
refactor: renaming in js tests
1 parent 0ae2f0f commit 6da3182

File tree

4 files changed

+52
-62
lines changed

4 files changed

+52
-62
lines changed

‎tests/js/color-scheme-switch-three-states/init-script.test.js‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ const scriptPath = path.resolve(process.cwd(), "scripts/ColorSchemeSwitchThreeSt
88
const DEFAULT_DARK = "dark";
99
const DEFAULT_LIGHT = "light";
1010

11-
function runThemeInitScript({
11+
function runInitScript({
1212
dark = DEFAULT_DARK,
1313
light = DEFAULT_LIGHT,
14-
functionName = "themeTypeInit",
14+
functionName = "colorSchemeInit",
1515
matchMediaDarkMatches = false,
1616
matchMediaLightMatches = false,
1717
} = {}) {
@@ -70,36 +70,36 @@ describe("ThemeInitScript.js IIFE behavior (three states)", () => {
7070
it("adds dark class when localStorage.colorScheme is dark", () => {
7171
localStorage.setItem("colorScheme", DEFAULT_DARK);
7272

73-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
73+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
7474

7575
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
7676
});
7777

7878
it("does not add dark class when localStorage.colorScheme is light", () => {
7979
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
8080

81-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
81+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
8282

8383
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
8484
});
8585

8686
it("adds dark class when no localStorage.colorScheme and prefers-color-scheme: dark", () => {
8787
// No localStorage.colorScheme
88-
runThemeInitScript({ matchMediaDarkMatches: true, matchMediaLightMatches: false });
88+
runInitScript({ matchMediaDarkMatches: true, matchMediaLightMatches: false });
8989

9090
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
9191
});
9292

9393
it("does not add dark class when no localStorage.colorScheme and prefers-color-scheme: light", () => {
9494
// No localStorage.colorScheme
95-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: true });
95+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: true });
9696

9797
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
9898
});
9999

100100
it("adds no class when no localStorage.colorScheme and no preference", () => {
101101
// No localStorage.colorScheme and matchMedia false
102-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
102+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
103103

104104
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
105105
});
@@ -108,8 +108,8 @@ describe("ThemeInitScript.js IIFE behavior (three states)", () => {
108108
localStorage.setItem("colorScheme", DEFAULT_DARK);
109109

110110
expect(() => {
111-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
112-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
111+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
112+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
113113
}).not.toThrow();
114114

115115
// classList does not duplicate tokens; just ensure it is present
@@ -119,18 +119,8 @@ describe("ThemeInitScript.js IIFE behavior (three states)", () => {
119119
it("adds dark class when switching to dark", () => {
120120
localStorage.setItem("colorScheme", DEFAULT_DARK);
121121

122-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
122+
runInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
123123

124124
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
125125
});
126-
127-
it("removes dark class when switching to light", () => {
128-
// First set dark
129-
document.documentElement.classList.add(DEFAULT_DARK);
130-
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
131-
132-
runThemeInitScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
133-
134-
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
135-
});
136126
});

‎tests/js/color-scheme-switch-three-states/switch-script.test.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ const DEFAULT_DARK = "dark";
1010
const DEFAULT_LIGHT = "light";
1111
const DEFAULT_SYSTEM = "system";
1212

13-
function runThemeSwitchScript({
13+
function runSwitchScript({
1414
dark = DEFAULT_DARK,
1515
light = DEFAULT_LIGHT,
16-
functionName = "themeSwitch",
16+
functionName = "colorSchemeSwitch",
1717
toggleKey = DEFAULT_TOGGLE_KEY,
1818
matchMediaDarkMatches = false,
1919
matchMediaLightMatches = false,
@@ -102,7 +102,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
102102
localStorage.setItem("colorScheme", DEFAULT_DARK);
103103
document.documentElement.classList.add(DEFAULT_DARK);
104104

105-
runThemeSwitchScript();
105+
runSwitchScript();
106106
window.inlineScripts.switchColorScheme();
107107

108108
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
@@ -112,7 +112,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
112112
it("transitions from light to system with dark preference", () => {
113113
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
114114

115-
runThemeSwitchScript({ matchMediaDarkMatches: true, matchMediaLightMatches: false });
115+
runSwitchScript({ matchMediaDarkMatches: true, matchMediaLightMatches: false });
116116
window.inlineScripts.switchColorScheme();
117117

118118
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
@@ -122,7 +122,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
122122
it("transitions from light to system with light preference", () => {
123123
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
124124

125-
runThemeSwitchScript({ matchMediaDarkMatches: false, matchMediaLightMatches: true });
125+
runSwitchScript({ matchMediaDarkMatches: false, matchMediaLightMatches: true });
126126
window.inlineScripts.switchColorScheme();
127127

128128
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
@@ -132,7 +132,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
132132
it("transitions from light to system with no preference", () => {
133133
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
134134

135-
runThemeSwitchScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
135+
runSwitchScript({ matchMediaDarkMatches: false, matchMediaLightMatches: false });
136136
window.inlineScripts.switchColorScheme();
137137

138138
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
@@ -142,7 +142,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
142142
it("transitions from system to dark", () => {
143143
localStorage.setItem("colorScheme", DEFAULT_SYSTEM);
144144

145-
runThemeSwitchScript();
145+
runSwitchScript();
146146
window.inlineScripts.switchColorScheme();
147147

148148
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
@@ -152,7 +152,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
152152
it("transitions from undefined/empty to dark", () => {
153153
// No colorScheme set in localStorage
154154

155-
runThemeSwitchScript();
155+
runSwitchScript();
156156
window.inlineScripts.switchColorScheme();
157157

158158
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
@@ -163,7 +163,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
163163
localStorage.setItem("colorScheme", DEFAULT_DARK);
164164
document.documentElement.classList.add(DEFAULT_DARK);
165165

166-
runThemeSwitchScript({ matchMediaDarkMatches: true });
166+
runSwitchScript({ matchMediaDarkMatches: true });
167167

168168
// Dark -> Light
169169
window.inlineScripts.switchColorScheme();
@@ -190,7 +190,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
190190
const eventListener = vi.fn();
191191
document.addEventListener("colorSchemeChanged", eventListener);
192192

193-
runThemeSwitchScript();
193+
runSwitchScript();
194194
window.inlineScripts.switchColorScheme();
195195

196196
expect(eventListener).toHaveBeenCalledTimes(1);
@@ -207,7 +207,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
207207
const eventListener = vi.fn();
208208
document.addEventListener("colorSchemeChanged", eventListener);
209209

210-
runThemeSwitchScript();
210+
runSwitchScript();
211211
window.inlineScripts.switchColorScheme();
212212

213213
expect(eventListener).toHaveBeenCalledTimes(1);
@@ -224,7 +224,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
224224
localStorage.setItem("colorScheme", DEFAULT_DARK);
225225
document.documentElement.classList.add(DEFAULT_DARK);
226226

227-
runThemeSwitchScript();
227+
runSwitchScript();
228228
dispatchKeydown(DEFAULT_TOGGLE_KEY);
229229

230230
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
@@ -235,7 +235,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
235235
localStorage.setItem("colorScheme", DEFAULT_DARK);
236236
document.documentElement.classList.add(DEFAULT_DARK);
237237

238-
runThemeSwitchScript();
238+
runSwitchScript();
239239

240240
dispatchKeydown(DEFAULT_TOGGLE_KEY, { ctrlKey: true });
241241
expect(localStorage.getItem("colorScheme")).toBe(DEFAULT_DARK);
@@ -251,7 +251,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
251251
localStorage.setItem("colorScheme", DEFAULT_DARK);
252252
document.documentElement.classList.add(DEFAULT_DARK);
253253

254-
runThemeSwitchScript({ toggleKey: "t" });
254+
runSwitchScript({ toggleKey: "t" });
255255

256256
// wrong key - no toggle
257257
dispatchKeydown(DEFAULT_TOGGLE_KEY);
@@ -267,7 +267,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
267267
localStorage.setItem("colorScheme", DEFAULT_DARK);
268268
document.documentElement.classList.add(DEFAULT_DARK);
269269

270-
runThemeSwitchScript();
270+
runSwitchScript();
271271

272272
// Create and focus an input element
273273
const input = document.createElement("input");
@@ -289,7 +289,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
289289
localStorage.setItem("colorScheme", DEFAULT_DARK);
290290
document.documentElement.classList.add(DEFAULT_DARK);
291291

292-
runThemeSwitchScript();
292+
runSwitchScript();
293293

294294
// Create and focus a textarea element
295295
const textarea = document.createElement("textarea");
@@ -311,7 +311,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
311311
localStorage.setItem("colorScheme", DEFAULT_DARK);
312312
document.documentElement.classList.add(DEFAULT_DARK);
313313

314-
runThemeSwitchScript();
314+
runSwitchScript();
315315

316316
// Create and focus a select element
317317
const select = document.createElement("select");
@@ -337,7 +337,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
337337
localStorage.setItem("colorScheme", DEFAULT_DARK);
338338
document.documentElement.classList.add(DEFAULT_DARK);
339339

340-
runThemeSwitchScript();
340+
runSwitchScript();
341341

342342
// Create and focus a contentEditable element
343343
const div = document.createElement("div");
@@ -361,7 +361,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
361361
localStorage.setItem("colorScheme", DEFAULT_DARK);
362362
document.documentElement.classList.add(DEFAULT_DARK);
363363

364-
runThemeSwitchScript();
364+
runSwitchScript();
365365

366366
// Create an input but don't focus it
367367
const input = document.createElement("input");
@@ -385,7 +385,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
385385
const eventListener = vi.fn();
386386
document.addEventListener("colorSchemeChanged", eventListener);
387387

388-
runThemeSwitchScript();
388+
runSwitchScript();
389389
dispatchKeydown(DEFAULT_TOGGLE_KEY);
390390

391391
expect(eventListener).toHaveBeenCalledTimes(1);
@@ -402,8 +402,8 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
402402
localStorage.setItem("colorScheme", DEFAULT_DARK);
403403

404404
expect(() => {
405-
runThemeSwitchScript();
406-
runThemeSwitchScript();
405+
runSwitchScript();
406+
runSwitchScript();
407407
}).not.toThrow();
408408

409409
// Should still work after double initialization
@@ -418,7 +418,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
418418
localStorage.setItem("colorScheme", customDark);
419419
document.documentElement.classList.add(customDark);
420420

421-
runThemeSwitchScript({ dark: customDark, light: customLight });
421+
runSwitchScript({ dark: customDark, light: customLight });
422422
window.inlineScripts.switchColorScheme();
423423

424424
expect(document.documentElement.classList.contains(customDark)).toBe(false);
@@ -429,7 +429,7 @@ describe("ColorSchemeSwitchScript.js IIFE behavior (three states)", () => {
429429
localStorage.setItem("colorScheme", DEFAULT_DARK);
430430
document.documentElement.classList.add(DEFAULT_DARK);
431431

432-
runThemeSwitchScript({ matchMediaDarkMatches: true });
432+
runSwitchScript({ matchMediaDarkMatches: true });
433433

434434
// Call multiple times rapidly
435435
window.inlineScripts.switchColorScheme(); // Dark -> Light

‎tests/js/color-scheme-switch-two-states/init-script.test.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ const scriptPath = path.resolve(process.cwd(), "scripts/ColorSchemeSwitchTwoStat
88
const DEFAULT_DARK = "dark";
99
const DEFAULT_LIGHT = "light";
1010

11-
function runColorSchemeInitScript({
11+
function runInitScript({
1212
dark = DEFAULT_DARK,
1313
light = DEFAULT_LIGHT,
14-
functionName = "themeTypeInit",
14+
functionName = "colorSchemeInit",
1515
matchMediaMatches = false,
1616
} = {}) {
1717
// Load the template and substitute placeholders like PHP does
@@ -67,7 +67,7 @@ describe("ColorSchemeInitScript.js IIFE behavior", () => {
6767
it("adds dark class when localStorage.colorScheme is dark", () => {
6868
localStorage.setItem("colorScheme", DEFAULT_DARK);
6969

70-
runColorSchemeInitScript({ matchMediaMatches: false });
70+
runInitScript({ matchMediaMatches: false });
7171

7272
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
7373
expect(document.documentElement.classList.contains(DEFAULT_LIGHT)).toBe(false);
@@ -76,23 +76,23 @@ describe("ColorSchemeInitScript.js IIFE behavior", () => {
7676
it("adds no class when localStorage.colorScheme is light", () => {
7777
localStorage.setItem("colorScheme", DEFAULT_LIGHT);
7878

79-
runColorSchemeInitScript({ matchMediaMatches: false });
79+
runInitScript({ matchMediaMatches: false });
8080

8181
expect(document.documentElement.classList.contains(DEFAULT_LIGHT)).toBe(false);
8282
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
8383
});
8484

8585
it("adds dark class when no localStorage.colorScheme and prefers-color-scheme: dark", () => {
8686
// No localStorage.colorScheme
87-
runColorSchemeInitScript({ matchMediaMatches: true });
87+
runInitScript({ matchMediaMatches: true });
8888

8989
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(true);
9090
expect(document.documentElement.classList.contains(DEFAULT_LIGHT)).toBe(false);
9191
});
9292

9393
it("adds no class when no localStorage.colorScheme and no dark preference", () => {
9494
// No localStorage.colorScheme and matchMedia false
95-
runColorSchemeInitScript({ matchMediaMatches: false });
95+
runInitScript({ matchMediaMatches: false });
9696

9797
expect(document.documentElement.classList.contains(DEFAULT_DARK)).toBe(false);
9898
expect(document.documentElement.classList.contains(DEFAULT_LIGHT)).toBe(false);
@@ -102,8 +102,8 @@ describe("ColorSchemeInitScript.js IIFE behavior", () => {
102102
localStorage.setItem("colorScheme", DEFAULT_DARK);
103103

104104
expect(() => {
105-
runColorSchemeInitScript({ matchMediaMatches: false });
106-
runColorSchemeInitScript({ matchMediaMatches: false });
105+
runInitScript({ matchMediaMatches: false });
106+
runInitScript({ matchMediaMatches: false });
107107
}).not.toThrow();
108108

109109
// classList does not duplicate tokens; just ensure it is present

0 commit comments

Comments
 (0)