[PB-4263] Backup folders popup overlaps file explorer window #239
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlexisMora
changed the title
AlexisMora
force-pushed
the
fix/pb-4263-backup-overlaps-file-explorer
branch
from
f61c117 to
79ea1f8
Compare
|
egalvis27
requested changes
Feb 10, 2026
Comment on lines
+6
to
+11
| const mockWindow = { | ||
| hide: vi.fn(), | ||
| show: vi.fn(), | ||
| isVisible: vi.fn().mockReturnValue(true), | ||
| isDestroyed: vi.fn().mockReturnValue(false), | ||
| }; |
There was a problem hiding this comment.
To avoid having to create this fake object here, you can create a mock using mockDeep.
This way, you save yourself from having to define functions in the object manually. The only thing you would have to do is manually define the return of the isVisible and isDestroyed functions in beforeEach.
Suggested change
| const mockWindow = { | |
| hide: vi.fn(), | |
| show: vi.fn(), | |
| isVisible: vi.fn().mockReturnValue(true), | |
| isDestroyed: vi.fn().mockReturnValue(false), | |
| }; | |
| const mockWindow = mockDeep<BrowserWindow>(); |
Comment on lines
+13
to
+21
| vi.mock('electron', () => ({ | ||
| dialog: { | ||
| showOpenDialog: vi.fn(), | ||
| }, | ||
| BrowserWindow: { | ||
| getFocusedWindow: vi.fn(), | ||
| getAllWindows: vi.fn(), | ||
| }, | ||
| })); |
There was a problem hiding this comment.
These functions can be added to the same object in vitest.setup.main.ts to avoid duplication.
Comment on lines
+24
to
+26
| const mockedDialog = vi.mocked(dialog.showOpenDialog); | ||
| const mockedGetFocusedWindow = vi.mocked(BrowserWindow.getFocusedWindow); | ||
| const mockedGetAllWindows = vi.mocked(BrowserWindow.getAllWindows); |
There was a problem hiding this comment.
Use partialSpyOn helper intead of vi.mocked
Comment on lines
+28
to
+31
| beforeEach(() => { | ||
| mockedGetFocusedWindow.mockReturnValue(mockWindow as unknown as BrowserWindow); | ||
| mockedGetAllWindows.mockReturnValue([mockWindow] as unknown as BrowserWindow[]); | ||
| }); |
There was a problem hiding this comment.
Suggested change
| beforeEach(() => { | |
| mockedGetFocusedWindow.mockReturnValue(mockWindow as unknown as BrowserWindow); | |
| mockedGetAllWindows.mockReturnValue([mockWindow] as unknown as BrowserWindow[]); | |
| }); | |
| beforeEach(() => { | |
| mockedGetFocusedWindow.mockReturnValue(mockWindow as unknown as BrowserWindow); | |
| mockedGetAllWindows.mockReturnValue([mockWindow] as unknown as BrowserWindow[]); | |
| mockWindow.isVisible.mockReturnValue(true); | |
| mockWindow.isDestroyed.mockReturnValue(false); | |
| }); |
|
|
||
| await getPathFromDialog(); | ||
|
|
||
| expect(mockWindow.hide).toHaveBeenCalled(); |
There was a problem hiding this comment.
Use toBeCalled instead toHaveBeenCalled
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is Changed / Added
Now we hide backup folder selector when selecting path in hide explorer so that the file explorer always stays "on front" and dont overlap
Why
There was this issue while selecting the path to backup in the file explorer, where the backup folder selector window was overlaping the actual file explorer