mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-05-11 14:54:36 -07:00
ce332374bc
* fix: hide non-wiki workspaces from menu and disable remove for them (#694) * fix(workspace): make workspace settings save transactional to prevent data loss - Move disk write before memory update in Workspace.set() - Remove error swallowing in writeTidgiConfig() to let errors propagate - Add error handling in useForm.ts to catch and log save failures - Add UI error display in EditWorkspace/index.tsx - Only update Observable after successful persistence This fixes the issue where save button disappears but changes aren't persisted to tidgi.config.json, causing data loss when reopening settings. * feat(i18n): add error messages for workspace save failures Add SaveError and SaveErrorPrefix translations in English and Chinese to display error messages when workspace settings fail to save. * test(e2e): add test for tagNames persistence and missing step definitions - Add @edit-workspace-save-tagnames scenario to verify tagNames persist after save to tidgi.config.json - Add 'I clear and type' step definition for clearing input before typing - Add 'I close current window' step definition for closing windows - This test covers the regression where save button disappears but changes aren't persisted * use 5.4.0 * fix: spaced file in git op * fix: menu register race condition * Update pnpm-lock.yaml * Update wiki * fix: regenerate lockfile with pnpm 10.33.0 to fix checksum format * fix: remove unused import and useless constructor * fix: address Copilot review comments - Use new path for rename/copy in git operations - Ensure transactional workspace save (persist before cache update) - Normalize null label to undefined in menu * Remove close-window step; simplify UI typing Remove the Cucumber step that closed the current window and simplify a UI step by calling locator.fill(...) inline (also replace {tmpDir} in the input). Clean up minor whitespace in gitOperations and fix indentation/extra brace around startWiki error handling in the wiki service to correct control flow and prevent accidental scope issues. * Improve workspace form, git diff, and UI tests Refactor EditWorkspace form and UI behavior, make git diff/status handling more robust, and update E2E tests. - Add hasConfigChanges and related effects in useForm to correctly detect config-only changes and control restart requests; fix save button visibility in EditWorkspace and pass currentWorkspace to restart snackbar. Rename workspace section test id from 'workspace-section-search' to 'preference-section-search'. - Enhance gitOperations.getFileDiff to use porcelain -z and a helper to parse per-path status (getPorcelainStatusForPath) for reliable untracked/deleted detection. - Add clickBrowserViewElementWithRetry helper with backoff and text-aware selector handling; replace repetitive click logic in browser view step definitions and remove some redundant browser background assertions and a deprecated clear-and-type step. - Update feature files (gitLog, editWorkspace, vectorSearch) to reflect selector/id/name changes and i18n fallbacks for tab/button text. * doc * Use localized draft selector and show e2e window Update feature tests to target the localized draft tiddler title (data-tiddler-title$='的草稿') instead of the English prefix selector. Applied the change across features/hibernation.feature and features/tiddler.feature to ensure selectors match localized UI. Also enable SHOW_E2E_WINDOW=1 in the test:manual-e2e script in package.json so manual end-to-end runs open a visible window for debugging.
302 lines
21 KiB
Gherkin
302 lines
21 KiB
Gherkin
Feature: Git Log Window
|
|
As a user
|
|
I want to view git commit history in a dedicated window
|
|
So that I can track changes to my wiki
|
|
|
|
Background:
|
|
Given I cleanup test wiki so it could create a new one on start
|
|
And I launch the TidGi application
|
|
And I wait for the page to load completely
|
|
Then I should see a "default wiki workspace" element with selector "div[data-testid^='workspace-']:has-text('wiki')"
|
|
# Enable file system watch for testing (default is false in production)
|
|
When I update workspace "wiki" settings:
|
|
| property | value |
|
|
| enableFileSystemWatch | true |
|
|
When I click on a "default wiki workspace button" element with selector "div[data-testid^='workspace-']:has-text('wiki')"
|
|
Then the browser view should be loaded and visible
|
|
And I wait for SSE and watch-fs to be ready
|
|
And I wait for "git initialization" log marker "[test-id-git-init-complete]"
|
|
|
|
@git
|
|
Scenario: View git commit in Git Log window
|
|
# Create a new tiddler file to trigger a git commit
|
|
When I create file "{tmpDir}/wiki/tiddlers/GitLogTestTiddler.tid" with content:
|
|
"""
|
|
created: 20250226070000000
|
|
modified: 20250226070000000
|
|
title: GitLogTestTiddler
|
|
tags: TestTag
|
|
|
|
This is a test tiddler for git log feature.
|
|
"""
|
|
Then I wait for tiddler "GitLogTestTiddler" to be added by watch-fs
|
|
# Use menu to commit the file - this will use default message (no AI configured)
|
|
When I click menu "同步和备份 > 立即本地Git备份"
|
|
# wait for git operation to complete
|
|
Then I wait for "git commit completed" log marker "[test-id-git-commit-complete]"
|
|
# Open Git Log through menu
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
# Wait for git log to query history and render UI
|
|
Then I wait for "git log UI refreshed" log marker "[test-id-git-log-refreshed]"
|
|
# Verify the git log window shows commits
|
|
Then I should see "git log list and commit with default message" elements with selectors:
|
|
| element description | selector |
|
|
| git log list | [data-testid='git-log-list'] |
|
|
| commit with default message | p.MuiTypography-body2:has-text('使用太记桌面版备份') |
|
|
# Click on the commit row containing GitLogTestTiddler file
|
|
When I click on a "commit row with GitLogTestTiddler" element with selector "[data-testid^='commit-row-']:has-text('GitLogTestTiddler')"
|
|
# Verify the filename appears in the details panel (may include path like tiddlers/GitLogTestTiddler.tid)
|
|
Then I should see a "GitLogTestTiddler.tid file in details" element with selector "li:has-text('GitLogTestTiddler')"
|
|
|
|
@git
|
|
Scenario: Git Log window shows uncommitted changes and commit now button works
|
|
# Modify the existing Index.tid file to create uncommitted changes
|
|
And I modify file "{tmpDir}/wiki/tiddlers/Index.tid" to contain "Modified Index content - testing realtime update!"
|
|
Then I wait for tiddler "Index" to be updated by watch-fs
|
|
# Open Git Log window
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I should see "Modified Index content" in the browser view content
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
# Verify uncommitted changes is auto-selected by checking if the file list is visible
|
|
Then I should see "uncommitted changes row and Index.tid file in uncommitted list" elements with selectors:
|
|
| element description | selector |
|
|
| uncommitted changes row | [data-testid='uncommitted-changes-row']|
|
|
| Index.tid file in uncommitted list | li:has-text('Index.tid') |
|
|
# Switch to Actions tab to access commit button
|
|
When I click on a "actions tab" element with selector "button[role='tab']:has-text('操作'), button[role='tab']:has-text('Actions')"
|
|
# Verify the commit now button is visible
|
|
Then I should see a "commit now button" element with selector "button[data-testid='commit-now-button']"
|
|
# In uncommitted state, sync-to-remote button must NOT appear (it only appears for unpushed commits)
|
|
Then I should not see a "sync-to-remote button" element with selector "button[data-testid='sync-to-remote-button']"
|
|
# Clear old git-log-refreshed markers BEFORE clicking commit button
|
|
When I clear log lines containing "[test-id-git-log-refreshed]"
|
|
# Click the commit now button
|
|
When I click on a "commit now button" element with selector "button[data-testid='commit-now-button']"
|
|
# Wait for git commit to complete and UI to refresh
|
|
Then I wait for log markers:
|
|
| description | marker |
|
|
| git commit completed | [test-id-git-commit-complete] |
|
|
| git log refreshed after commit | [test-id-git-log-refreshed] |
|
|
# Verify that uncommitted changes row is gone (commit was successful)
|
|
Then I should not see a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Verify the correct commit is selected and we're on the latest commit (should show amend button)
|
|
Then I should see "selected commit row and commit message and amend button and revert button" elements with selectors:
|
|
| element description | selector |
|
|
| selected commit row | [data-testid^='commit-row-'][data-selected='true']:has-text('使用太记桌面版备份') |
|
|
| commit message | p.MuiTypography-body2:has-text('使用太记桌面版备份') |
|
|
| amend button | button:has-text('修改') |
|
|
| revert button | button:has-text('回滚') |
|
|
# Clear the git-log-refreshed marker BEFORE clicking revert button
|
|
When I clear log lines containing "[test-id-git-log-refreshed]"
|
|
# Click revert button
|
|
When I click on a "revert button" element with selector "button:has-text('回滚')"
|
|
# Wait for git revert operation to complete and UI to refresh
|
|
Then I wait for log markers:
|
|
| description | marker |
|
|
| git revert completed | [test-id-git-revert-complete] |
|
|
| git log refreshed after revert | [test-id-git-log-refreshed] |
|
|
# Verify new revert commit is selected and revert button is visible
|
|
Then I should see "selected revert commit row and revert button for the new revert commit" elements with selectors:
|
|
| element description | selector |
|
|
| selected revert commit row | [data-testid^='commit-row-'][data-selected='true']:has-text('回退提交') |
|
|
| revert button for the new revert commit| button:has-text('回滚') |
|
|
# Switch back to main window to verify the revert
|
|
When I switch to "main" window
|
|
# Wait for tiddler to be updated by watch-fs after git revert
|
|
Then I wait for tiddler "Index" to be updated by watch-fs
|
|
# The modified content should be reverted, and make sure file won't be deleted
|
|
Then I should not see a "missing tiddler indicator" element in browser view with selector "[data-tiddler-title='Index']:has-text('佚失')"
|
|
Then I should not see a "modified content in Index tiddler" element in browser view with selector "[data-tiddler-title='Index']:has-text('Modified Index content')"
|
|
|
|
@git
|
|
Scenario: Discard uncommitted changes for a single file
|
|
# Modify the existing Index.tid file to create uncommitted changes
|
|
And I modify file "{tmpDir}/wiki/tiddlers/Index.tid" to contain "Discard test content - should be reverted!"
|
|
Then I wait for tiddler "Index" to be updated by watch-fs
|
|
# Open Git Log window
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I should see "Discard test content" in the browser view content
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
Then I should see a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Click on the uncommitted changes row
|
|
When I click on a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Verify we can see the modified Index.tid file
|
|
Then I should see a "Index.tid file in uncommitted list" element with selector "li:has-text('Index.tid')"
|
|
# Click on the Index.tid file to select it
|
|
When I click on a "Index.tid file in list" element with selector "li:has-text('Index.tid')"
|
|
# Verify the file diff panel has loaded by checking for the file name header
|
|
Then I should see a "file name header in diff panel" element with selector "h6:has-text('Index.tid')"
|
|
# Click the Actions tab in the file diff panel (the one that has the file name above it)
|
|
# We need to find the Actions tab that is a sibling of the h6 containing "Index.tid"
|
|
When I click on a "actions tab in file diff panel" element with selector "h6:has-text('Index.tid') ~ div button[role='tab']:has-text('操作')"
|
|
# Verify the discard changes button exists (only shows for uncommitted changes)
|
|
Then I should see a "discard changes button" element with selector "button:has-text('放弃修改')"
|
|
When I click on a "discard changes button" element with selector "button:has-text('放弃修改')"
|
|
# Verify the file is no longer in the uncommitted list (should go back to showing no selection)
|
|
Then I should not see a "Index.tid file still selected" element with selector "li:has-text('Index.tid')[class*='selected']"
|
|
# Switch back to main window to verify the discard
|
|
When I switch to "main" window
|
|
# The modified content should be discarded
|
|
Then I should not see a "modified content in Index tiddler" element in browser view with selector "[data-tiddler-title='Index']:has-text('Discard test content')"
|
|
|
|
@git
|
|
Scenario: Git Log window auto-refreshes when files change (only when window is open)
|
|
# Open Git Log window FIRST
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
# Should see initial commits
|
|
Then I should see a "commit history list" element with selector "[data-testid='git-log-list']"
|
|
# Now modify a file WHILE window is open - this should trigger auto-refresh
|
|
When I switch to "main" window
|
|
And I modify file "{tmpDir}/wiki/tiddlers/Index.tid" to contain "Modified with window open"
|
|
Then I wait for tiddler "Index" to be updated by watch-fs
|
|
# Wait for git log to auto-refresh after detecting file changes
|
|
And I wait for "git log auto-refreshed after file change" log marker "[test-id-git-log-refreshed]"
|
|
# Switch back to git log window
|
|
When I switch to "gitHistory" window
|
|
# Should see uncommitted changes row appear or update
|
|
Then I should see a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Click on uncommitted changes to verify the modified file is there
|
|
When I click on a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Should see Index.tid in the uncommitted list
|
|
Then I should see a "Index.tid in uncommitted list" element with selector "li:has-text('Index.tid')"
|
|
# Now create a NEW file while window is still open
|
|
When I switch to "main" window
|
|
And I create file "{tmpDir}/wiki/tiddlers/AutoRefreshTest.tid" with content:
|
|
"""
|
|
created: 20250227070000000
|
|
modified: 20250227070000000
|
|
title: AutoRefreshTest
|
|
tags: TestTag
|
|
|
|
This file is created to test auto-refresh when git log window is open.
|
|
"""
|
|
Then I wait for tiddler "AutoRefreshTest" to be added by watch-fs
|
|
# Wait for git log to auto-refresh after detecting new file
|
|
And I wait for "git log auto-refreshed after new file" log marker "[test-id-git-log-refreshed]"
|
|
# Switch back to git log window
|
|
When I switch to "gitHistory" window
|
|
# The uncommitted changes row should still be visible
|
|
Then I should see a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Click on uncommitted changes again to see both files
|
|
When I click on a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
# Both Index.tid and AutoRefreshTest.tid should be in the uncommitted list
|
|
Then I should see "Index.tid and AutoRefreshTest.tid in uncommitted list" elements with selectors:
|
|
| element description | selector |
|
|
| Index.tid in uncommitted list | li:has-text('Index.tid') |
|
|
| AutoRefreshTest.tid in uncommitted list | li:has-text('AutoRefreshTest.tid') |
|
|
|
|
@git @sync
|
|
Scenario: GitLog sync-to-remote button pushes unpushed commits to remote
|
|
# Configure a bare remote repository so this workspace becomes a cloud workspace
|
|
When I create a bare git repository at "{tmpDir}/remote-gitlog-sync.git"
|
|
When I open edit workspace window for workspace with name "wiki"
|
|
And I switch to "editWorkspace" window
|
|
And I wait for the page to load completely
|
|
When I click on "saveAndSyncOptions accordion and syncToCloud toggle" elements with selectors:
|
|
| element description | selector |
|
|
| saveAndSyncOptions accordion| [data-testid='preference-section-saveAndSync'] |
|
|
| syncToCloud toggle | [data-testid='synced-local-workspace-switch'] |
|
|
When I type in "git url input and github username input and github email input and github token input" elements with selectors:
|
|
| text | selector |
|
|
| {tmpDir}/remote-gitlog-sync.git | label:has-text('Git仓库线上网址') + * input, label:has-text('Git Repo URL') + * input, input[aria-label='Git仓库线上网址'], input[aria-label='Git Repo URL'] |
|
|
| testuser | [data-testid='github-userName-input'] input |
|
|
| testuser@example.com | [data-testid='github-email-input'] input |
|
|
| test-token-12345 | [data-testid='github-token-input'] input |
|
|
When I click on a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
Then I should not see a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
When I switch to "main" window
|
|
# Create a tiddler file to produce a change
|
|
When I create file "{tmpDir}/wiki/tiddlers/SyncButtonTest.tid" with content:
|
|
"""
|
|
created: 20250226100000000
|
|
modified: 20250226100000000
|
|
title: SyncButtonTest
|
|
tags: SyncTest
|
|
|
|
This tiddler tests the GitLog sync-to-remote button.
|
|
"""
|
|
Then I wait for tiddler "SyncButtonTest" to be added by watch-fs
|
|
# Do a local-only backup first (creates an unpushed commit)
|
|
When I click menu "同步和备份 > 立即本地Git备份"
|
|
Then I wait for "git commit completed" log marker "[test-id-git-commit-complete]"
|
|
# Open GitLog window and verify the sync-to-remote button appears on the unpushed commit
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
Then I wait for "git log UI refreshed" log marker "[test-id-git-log-refreshed]"
|
|
# Switch to Actions tab
|
|
When I click on a "actions tab" element with selector "button[role='tab']:has-text('操作'), button[role='tab']:has-text('Actions')"
|
|
# Verify sync-to-remote button is visible (this is the button that was previously broken)
|
|
Then I should see a "sync-to-remote button" element with selector "button[data-testid='sync-to-remote-button']"
|
|
When I clear test-id markers from logs
|
|
# Click the sync-to-remote button
|
|
When I click on a "sync-to-remote button" element with selector "button[data-testid='sync-to-remote-button']"
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
# Verify the file was pushed to the remote repository
|
|
And the remote repository "{tmpDir}/remote-gitlog-sync.git" should contain file "tiddlers/SyncButtonTest.tid"
|
|
|
|
@git
|
|
Scenario: Git Log multi-select commits with Ctrl and undo both
|
|
# Create first tiddler and commit it
|
|
When I create file "{tmpDir}/wiki/tiddlers/Space File 0.tid" with content:
|
|
"""
|
|
created: 20250420070000000
|
|
modified: 20250420070000000
|
|
title: Space File 0
|
|
tags: MultiSelectTest
|
|
|
|
First tiddler for multi-select undo test.
|
|
"""
|
|
Then I wait for tiddler "Space File 0" to be added by watch-fs
|
|
When I click menu "同步和备份 > 立即本地Git备份"
|
|
Then I wait for "git commit completed" log marker "[test-id-git-commit-complete]"
|
|
# Create second tiddler and commit it
|
|
When I create file "{tmpDir}/wiki/tiddlers/Space File 1.tid" with content:
|
|
"""
|
|
created: 20250420070000000
|
|
modified: 20250420070000000
|
|
title: Space File 1
|
|
tags: MultiSelectTest
|
|
|
|
Second tiddler for multi-select undo test.
|
|
"""
|
|
Then I wait for tiddler "Space File 1" to be added by watch-fs
|
|
When I clear log lines containing "[test-id-git-commit-complete]"
|
|
When I click menu "同步和备份 > 立即本地Git备份"
|
|
Then I wait for "git commit completed" log marker "[test-id-git-commit-complete]"
|
|
# Open Git Log window
|
|
When I click menu "同步和备份 > 查看历史备份"
|
|
And I switch to "gitHistory" window
|
|
And I wait for the page to load completely
|
|
Then I wait for "git log UI refreshed" log marker "[test-id-git-log-refreshed]"
|
|
# Click the commit containing Space File 1 to select it
|
|
When I click on a "commit row with Space File 1" element with selector "[data-testid^='commit-row-']:has-text('Space File 1')"
|
|
# Ctrl-click the commit containing Space File 0 to add it to selection
|
|
When I ctrl-click on a "commit row with Space File 0" element with selector "[data-testid^='commit-row-']:has-text('Space File 0')"
|
|
# Switch to Actions tab and verify undo button shows count of 2
|
|
When I click on a "actions tab" element with selector "button[role='tab']:has-text('操作')"
|
|
Then I should see a "undo button with count 2" element with selector "[data-testid='undo-commit-button']:has-text('(2)')"
|
|
# Clear markers and undo both commits
|
|
When I clear log lines containing "[test-id-git-log-refreshed]"
|
|
When I click on a "undo button" element with selector "[data-testid='undo-commit-button']"
|
|
Then I wait for "git log refreshed after undo" log marker "[test-id-git-log-refreshed]"
|
|
# Both commits should be gone; uncommitted changes should appear
|
|
Then I should see a "uncommitted changes row" element with selector "[data-testid='uncommitted-changes-row']"
|
|
Then I should not see a "commit with Space File 1" element with selector "[data-testid^='commit-row-']:not([data-testid='uncommitted-changes-row']):has-text('Space File 1')"
|
|
Then I should not see a "commit with Space File 0" element with selector "[data-testid^='commit-row-']:not([data-testid='uncommitted-changes-row']):has-text('Space File 0')"
|
|
# Undo is triggered from the commit details actions tab; switch back to details so file list is visible
|
|
When I click on a "details tab" element with selector "button[role='tab']:has-text('详情'), button[role='tab']:has-text('Details')"
|
|
# Verify uncommitted file with space in name can load diff/actions instead of failing with quoted path
|
|
When I click on a "new file with space in name" element with selector "[data-testid^='git-file-row-']:has-text('Space File 1.tid')"
|
|
Then I should see a "file name header in diff panel" element with selector "h6:has-text('Space File 1.tid')"
|
|
Then I should not see a "failed to load diff message" element with selector "*:has-text('加载差异失败')"
|
|
When I click on a "actions tab in file diff panel" element with selector "h6:has-text('Space File 1.tid') ~ div button[role='tab']:has-text('操作'), h6:has-text('Space File 1.tid') ~ div button[role='tab']:has-text('Actions')"
|
|
Then I should see a "discard changes button" element with selector "button:has-text('放弃修改'), button:has-text('Discard Changes')"
|
|
When I click on a "discard changes button" element with selector "button:has-text('放弃修改'), button:has-text('Discard Changes')"
|
|
Then I should not see a "new file still in uncommitted list" element with selector "[data-testid^='git-file-row-']:has-text('Space File 1.tid')"
|