Skip to content

fix: resolve Windows test timeout in custom-system-prompt.spec.ts #7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

fix: resolve Windows test timeout in custom-system-prompt.spec.ts #7977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
538f47b
fix: resolve Windows test timeout in custom-system-prompt.spec.ts
roomote Sep 14, 2025
01722c7
fix: resolve Windows test timeout in custom-system-prompt.spec.ts
roomote Sep 14, 2025
ca7de99
fix: add missing mocks for CodeIndexManager and os module
roomote Sep 14, 2025
72b8c6f
fix: add homedir to os mock in custom-system-prompt test
roomote Sep 14, 2025
e7dea2b
fix: properly mock os module in custom-system-prompt test
roomote Sep 14, 2025
2eba8a1
Delete ci_logs.txt
cte Sep 14, 2025
20e8099
Delete src/core/prompts/__tests__/utils.ts
cte Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/core/prompts/__tests__/custom-system-prompt.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ vi.mock("../../../utils/fs", () => ({
createDirectoriesForFile: vi.fn().mockResolvedValue([]),
}))

// Import path module to add toPosix to String prototype
import "../../../utils/path"
import { SYSTEM_PROMPT } from "../system"
import { defaultModeSlug, modes } from "../../../shared/modes"
import * as vscode from "vscode"
import * as fs from "fs/promises"
import { toPosix } from "./utils"

// Get the mocked fs module
const mockedFs = vi.mocked(fs)
Expand Down Expand Up @@ -121,7 +122,11 @@ describe("File-Based Custom System Prompt", () => {
const fileCustomSystemPrompt = "Custom system prompt from file"
// When called with utf-8 encoding, return a string
mockedFs.readFile.mockImplementation((filePath, options) => {
if (toPosix(filePath).includes(`.roo/system-prompt-${defaultModeSlug}`) && options === "utf-8") {
// Convert filePath to string and normalize path separators
const normalizedPath =
Copy link
Contributor Author

@roomote roomote bot Sep 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we extract this duplicated normalization logic into a helper function within the test file? I see the same code on lines 168-169. Something like:

const normalizeFilePath = (filePath: string | Buffer): string => {
  return typeof filePath === "string" 
    ? filePath.replace(/\/g, "/") 
    : filePath.toString('utf-8').replace(/\/g, "/")
}

Also, should we specify the encoding when calling toString() on a Buffer for better type safety?

typeof filePath === "string" ? filePath.replace(/\\/g, "/") : filePath.toString().replace(/\\/g, "/")

if (normalizedPath.includes(`.roo/system-prompt-${defaultModeSlug}`) && options === "utf-8") {
return Promise.resolve(fileCustomSystemPrompt)
}
return Promise.reject({ code: "ENOENT" })
Expand Down Expand Up @@ -159,7 +164,11 @@ describe("File-Based Custom System Prompt", () => {
// Mock the readFile to return content from a file
const fileCustomSystemPrompt = "Custom system prompt from file"
mockedFs.readFile.mockImplementation((filePath, options) => {
if (toPosix(filePath).includes(`.roo/system-prompt-${defaultModeSlug}`) && options === "utf-8") {
// Convert filePath to string and normalize path separators
const normalizedPath =
typeof filePath === "string" ? filePath.replace(/\\/g, "/") : filePath.toString().replace(/\\/g, "/")

if (normalizedPath.includes(`.roo/system-prompt-${defaultModeSlug}`) && options === "utf-8") {
return Promise.resolve(fileCustomSystemPrompt)
}
return Promise.reject({ code: "ENOENT" })
Expand Down
7 changes: 4 additions & 3 deletions src/core/prompts/__tests__/responses-rooignore.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import type { Mock } from "vitest"

// Import path module to add toPosix to String prototype
import "../../../utils/path"
import { formatResponse } from "../responses"
import { RooIgnoreController, LOCK_TEXT_SYMBOL } from "../../ignore/RooIgnoreController"
import { fileExistsAtPath } from "../../../utils/fs"
import * as fs from "fs/promises"
import { toPosix } from "./utils"

// Mock dependencies
vi.mock("../../../utils/fs")
Expand Down Expand Up @@ -86,7 +87,7 @@ describe("RooIgnore Response Formatting", () => {
return (
!filePath.includes("node_modules") &&
!filePath.includes(".git") &&
!toPosix(filePath).includes("secrets/")
!filePath.toString().toPosix().includes("secrets/")
Copy link
Contributor Author

@roomote roomote bot Sep 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional? I notice we're still using filePath.toString().toPosix() here, but in custom-system-prompt.spec.ts we replaced all toPosix() calls with inline normalization. This inconsistency might cause the same Windows test failures in this file. Should we apply the same inline normalization approach here?

Suggested change
!filePath.toString().toPosix().includes("secrets/")
const normalizedPath = typeof filePath === "string" ? filePath.replace(/\/g, "/") : filePath.toString().replace(/\/g, "/")
return (
!filePath.includes("node_modules") &&
!filePath.includes(".git") &&
!normalizedPath.includes("secrets/")
)

)
})

Expand Down Expand Up @@ -130,7 +131,7 @@ describe("RooIgnore Response Formatting", () => {
return (
!filePath.includes("node_modules") &&
!filePath.includes(".git") &&
!toPosix(filePath).includes("secrets/")
!filePath.toString().toPosix().includes("secrets/")
Copy link
Contributor Author

@roomote roomote bot Sep 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue here - we're still using filePath.toString().toPosix() which could fail on Windows. For consistency with the fix in custom-system-prompt.spec.ts, should we use inline normalization here too?

)
})

Expand Down
9 changes: 2 additions & 7 deletions src/core/prompts/__tests__/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import * as fs from "fs/promises"
import { PathLike } from "fs"

// Make a path take a unix-like form. Useful for making path comparisons.
export function toPosix(filePath: PathLike | fs.FileHandle) {
return filePath.toString().toPosix()
}
// This file is no longer needed as we're using String.prototype.toPosix() directly
// from src/utils/path module which is imported in the test files
Loading