mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-04-08 06:42:10 -07:00
4c5e1d16c7
* Use git service for backups and dynamic AI menus
Switch backup actions to call gitService.commitAndSync(commitOnly) so local backups work without remote auth and AI commit generation is triggered by omitting commitMessage. Make AI-related menu items always registered but use dynamic visibility/enabled checks (isAIEnabled) so they appear/disappear at runtime. Update menu item types/imports accordingly. Optimize workspace persistence to write only the single updated workspace to settings.json (stripping syncable fields when tidgi.config exists) instead of saving all workspaces; remove the old saveWorkspacesToSettings method. Add warnings/logging: warn if git worker observable is undefined, log/notify when cloud sync is skipped due to missing auth/gitUrl. Misc: remove a redundant debug log in tidgiConfig, remove native process monitoring startup call, include commitMessage for CommitDetailsPanel sync, and drop entriesFingerprint/debug noise from git log data.
* fix: avoid rewriting unchanged workspace config
* fix: separate plain and ai backup flows
* feat: add searchable settings views
* fix: narrow sync adaptor revision type
* chore: release tidgi-shared 0.1.3
* Preferences: unify Scheduled/Background tasks and fix skeleton nav
- Remove legacy background task UI/dialogs (use ScheduledTask unified system)
- Attach invisible anchors to skeleton placeholders so sidebar scrollIntoView works while loading
- Add English/zh translation keys for AddAlarm/AddHeartbeat
- Add requestIdleCallback polyfill (tests) and speed up to 0ms for tests
- Search: match English translations (txEn) in SearchResultsView
* Fix view zero-size on minimize; realign on restore/show
Guard view bounds from 0x0 content size to prevent BrowserView disappearing when window is minimized; fall back to safe offscreen size. Add window 'restore' and 'show' handlers to realign views. Add getMemoryUsage() in wiki worker and expose RSS/heap via getWorkersInfo; show worker memory in Developer Tools diagnostics.
* Fix background/quit behavior: synchronous close handler; platform-specific runOnBackground default; add getWindowMetaSync; add forced-exit timeout for before-quit cleanup
* Refactor preferences: add definitions and registry
Add a new structured preferences system: introduce definition schemas, typed item/section types, explicit section files, a registry (allSections/sectionById), side effects, action handlers, and helper builders (zodPreferencesSchema). Add custom preference UI items and registration (customItems, registerCustomSections) and tests validating schemas. Replace previous zod/settings schema files with the new definitions and make IPreferences an explicit TypeScript interface. Small UI updates: use LanguageSelectorItem and WikiUserNameItem in Guide and Help pages. Also remove net.isOnline() pre-checks from Git.commitAndSync and Git.forcePull to avoid false-negative network detections.
* Fix blank wiki after hide+reopen: re-attach orphaned views on realign
Root cause: three compounding issues when the main window is hidden and then re-shown via a second-instance shortcut click.
1. getView() now auto-removes stale entries whose webContents.isDestroyed() == true.
This allows addView() / showWorkspaceView() to recreate destroyed views instead of
silently skipping them (which left the new window blank).
2. realignView() now calls browserWindow.contentView.addChildView(view) before setBounds().
If a view survived window destruction but became orphaned (detached from its parent
BrowserWindow), re-attaching it makes it visible again. addChildView is idempotent
so normal re-entrant calls are safe.
3. window.open() existing-window branch now calls addViewForAllBrowserViews(activeWorkspace)
before realignActiveWorkspace(). This ensures that any destroyed/missing view is
recreated BEFORE the realign attempts to reposition it. The call is a no-op when
views already exist and are healthy.
* Fix blank WebContentsView after restoring hidden window (Windows bug)
Electron on Windows sometimes fails to repaint a WebContentsView that remains attached to a window that is hidden and then shown again. By unconditionally calling \
emoveChildView\ followed by \ddChildView\ during \
ealignView\ and \showView\, we force the Chromium compositor to reparent and paint the view correctly, ensuring the Wiki becomes visible as soon as the user restores the app from the background.
* Fix blank WebView on window restore: show view before realign, fix same-workspace click
Two root causes identified and fixed:
1. openWorkspaceTiddler silently skipped setActiveWorkspaceView when the user
clicked the already-active workspace icon (guard: oldId !== newId). The view
was blank and clicking its icon did nothing. Guard removed setActiveWorkspaceView
is now always called; it is safe with the same ID (hibernation guard is already
correct for that case).
2. The 'show' event handler and window.open() existing-window path were calling
realignActiveWorkspace() which only calls setBounds. On Windows, when a window
transitions from hidden/background to visible the Chromium compositor may not
repaint a WebContentsView whose bounds have not changed. Both paths now call
refreshActiveWorkspaceView() a new lightweight helper that calls showView()
(removeChildView + addChildView + setBounds + webContents.focus) before realigning.
This forces a compositor repaint and makes the wiki page visible immediately.
* Refactor view restore chain: clean up redundant repaint/realign calls
Full chain analysis identified 4 structural problems:
1. refreshActiveWorkspaceView() called TWICE concurrently on window restore:
window.open() called existedWindow.show() which fired the 'show' event
refreshActiveWorkspaceView() AND THEN immediately called refreshActiveWorkspaceView()
again explicitly, creating a race condition on removeChildView+addChildView.
2. realignView() contained removeChildView+addChildView, which ran immediately after
showView() already did removeChildView+addChildView+setBounds+focus. The second
remove+add clobbered the focus state set by showView, breaking keyboard focus.
3. setActiveWorkspaceView() called showWorkspaceView + realignActiveWorkspace, meaning
the view was remove+add+setBounds+focused by showView, then immediately remove+add+
setBounds-without-focus again by realignView. Double bounds, lost focus.
4. Same pattern in refreshActiveWorkspaceView: showWorkspaceView + realignActiveWorkspace.
Clean design after refactor:
- showView() = force-repaint path: remove+add+setBounds+focus (unchanged)
- realignView() = bounds-only: setBounds ONLY, no remove+add
- showWorkspaceView = calls showView for main+mini windows
- realignActiveWorkspace = calls realignView (now just setBounds) + buildMenu;
used for fullscreen/sidebar/resize events
- setActiveWorkspaceView = showWorkspaceView + buildMenu (not +realignActiveWorkspace)
- refreshActiveWorkspaceView = showWorkspaceView + buildMenu (not +realignActiveWorkspace);
called from 'show' window event (fire-and-forget: no rethrow)
- window.open() existing-window = show() only; 'show' event handler calls
refreshActiveWorkspaceView automatically, no duplicate call
* chore: bump electron-ipc-cat to 2.4.0
Rolling Observable timeout (120s initial, 60s idle) fixes git-upload-pack
timeout for large repos (100+ MB) during mobile sync.
* style: unify layout between Preferences and EditWorkspace
Use PageRoot and PageInner from PreferenceComponents to eliminate subtle padding/background differences. Resize EditWorkspace window to match Preferences. Clean up lint errors.
* Add E2E test for window-restore blank-view bug + log markers
Two changes:
1. Log markers added to aid diagnosis and enable E2E verification:
- [test-id-VIEW_SHOWN] in ViewService.showView()
- [test-id-REFRESH_ACTIVE_VIEW_START/DONE] in WorkspaceView.refreshActiveWorkspaceView()
2. New E2E feature: features/windowRestore.feature
Scenario 1: 'Wiki WebContentsView is visible immediately after restoring hidden window'
- hides main window (same path as close+runOnBackground)
- triggers second-instance via app.emit('second-instance')
- asserts [test-id-REFRESH_ACTIVE_VIEW_DONE] and [test-id-VIEW_SHOWN] log markers
- asserts browser view is within visible window bounds
- asserts wiki content is readable
Scenario 2: 'Clicking already-active workspace icon re-shows the WebContentsView'
- verifies the removed oldId !== newId guard: clicking current workspace must
now call setActiveWorkspaceView which fires showView
Two step definitions added to features/stepDefinitions/application.ts:
- 'I hide the main window as if closing with runOnBackground'
calls BrowserWindow.hide() directly in main process
- 'I reopen the main window as second instance would'
emits app 'second-instance' event in main process
* Fix E2E test: correct second-instance emit args, add wiki-ready wait in Background
Three issues found and fixed by running the tests:
1. app.emit('second-instance') argument order wrong
DeepLinkService listener: (_event, commandLine) => commandLine.pop()
Our emit: app.emit('second-instance', [], process.cwd(), {})
This made 'process.cwd()' land in commandLine, .pop() failed on a string.
Fix: app.emit('second-instance', {}, [], '', {}) fake Event first,
then empty argv array, then workingDirectory.
2. In test mode, window.open() skips existedWindow.show() to avoid UI popups.
The 'show' event never fired so refreshActiveWorkspaceView was never called
and the window stayed hidden from Playwright's perspective.
Fix: explicitly call mainWindow.show() via app.evaluate() after emitting
second-instance, replicating what production window.open() does.
3. Background used 'the browser view should be loaded and visible' which has
a 21-second timeout and fails before TiddlyWiki finishes initializing in
the test environment (pre-existing issue in defaultWiki.feature too).
Fix: replaced with deterministic log marker waits:
[test-id-WIKI_WORKER_STARTED] + [test-id-VIEW_LOADED]
plus 'I confirm the main window browser view is positioned within visible
window bounds' for a structural check without content dependency.
Result: both @window-restore scenarios pass (31/31 steps green, ~48s).
* Fix reopened main window restore after recreation and rebind view resize
Root cause on Windows was not the hide/show path, but the close+recreate path when tidgi mini window keeps the app alive while runOnBackground is false.
What was actually happening:
1. The user closed the main window.
2. The app stayed alive because tidgi mini window still existed.
3. A second-instance launch recreated a new main BrowserWindow.
4. The old workspace WebContentsView still existed in ViewService.
5. But the new main window missed the automatic restore because the BrowserWindow 'show' event fired inside handleCreateBasicWindow() before registerBrowserViewWindowListeners() attached the 'show' listener.
6. If the user then clicked the workspace icon, showView() reattached the old view manually, but its resize listener was still bound to the old destroyed BrowserWindow, so resizing the new window no longer resized the view.
Fix:
- ViewService now rebinds the debounced resize handler every time showView() attaches an existing view to a BrowserWindow.
- Window.open() now detects the recreate-main-window case for BrowserView windows and immediately calls refreshActiveWorkspaceView() if the active workspace already has an existing view instance.
This restores the view without waiting for a workspace icon click.
Why old E2E missed it:
- It simulated hide/show (runOnBackground=true) instead of the real user path (main window close + app kept alive by tidgi mini window).
- It only checked that the view was within visible bounds; it did not resize the window and assert the view filled the content area after the reopen.
New E2E coverage:
- Configures tidgiMiniWindow=true and runOnBackground=false before launch.
- Closes the main window, reopens it via second-instance, verifies refresh/view-shown markers, verifies bounds, resizes the recreated main window, and asserts the BrowserView fills the content area after the debounced resize handler runs.
- Scenario passes locally: 1 scenario, 20 steps, all green.
* Update pnpm-lock.yaml
* fix: address Copilot PR review issues
- Restore workspaceID from window.meta() in EditWorkspace (was hard-coded debug value)
- Add missing React/type imports to customComponentRegistry.ts, workspaceCustomComponentRegistry.ts, registerCustomSections.tsx, registerWorkspaceCustomSections.tsx, useSections.ts
- Fix HighlightText regex: use index parity (odd index = match) instead of stateful regex.test() with global flag
- Fix actionHandlers native.pickDirectory to read current preference value instead of passing the key string as a path
- Move PreferenceComponents import before registerCustomSections() call to fix import ordering
* fix: fix import ordering to satisfy dprint/eslint format rules
* fix: stabilize e2e selectors and EditWorkspace loading fallback
- align workspace section testids in e2e features
- migrate background-task e2e to scheduled-task selectors
- add edit workspace fallback loading when metadata/observable is late
- add deterministic switch testid for schema boolean items
- make sync snackbar assertion resilient to progress text changes
- clear draft-check timeout handle in sync service
* fix: add apiKey to test provider config so isAIAvailable() returns true
The AI commit message e2e test expects both commit-now-button and
commit-now-ai-button to appear. The AI button only renders when
isAIGenerateBackupTitleEnabled() returns true, which internally calls
externalAPIService.isAIAvailable(). That method requires a non-empty
apiKey for openAICompatible providers, but the test's
createProviderConfig() never set one, causing isAIAvailable() to
return false and the AI button to never render.
* feat(gitServer): add generateFullArchive for fast mobile clone
- Add generateFullArchive() to IGitServerService interface
- Implement tar archive generation: git archive + system tar append
- Archives working tree + minimal .git metadata (HEAD, refs, objects)
- Cache by HEAD commit hash, auto-cleanup old archives
- Bump tidgi-shared to 0.1.5
* fix(e2e): resolve workspace by runtime name/folder in step defs
* fix(ci): satisfy lint rules in gitServer archive generation
315 lines
16 KiB
Gherkin
315 lines
16 KiB
Gherkin
Feature: Git Sync
|
||
As a user
|
||
I want to sync my wiki to a remote repository
|
||
So that I can backup and share my content
|
||
|
||
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 and HTTP API (for mobile sync) together
|
||
When I update workspace "wiki" settings:
|
||
| property | value |
|
||
| enableFileSystemWatch | true |
|
||
| enableHTTPAPI | true |
|
||
| port | 15212 |
|
||
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 @sync @mobilesync
|
||
Scenario: Desktop cloud sync and mobile HTTP sync cover commit-push, diverged merge, and mobile conflict resolution
|
||
# ══════════════════════════════════════════════════════════════════
|
||
# Part 1: Sync to local remote via application menu (commit & push)
|
||
# ══════════════════════════════════════════════════════════════════
|
||
When I create a bare git repository at "{tmpDir}/remote-repo-menu.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-repo-menu.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
|
||
When I create file "{tmpDir}/wiki/tiddlers/SyncMenuTestTiddler.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: SyncMenuTestTiddler
|
||
tags: SyncTest
|
||
|
||
This is a test tiddler for sync via menu feature.
|
||
"""
|
||
Then I wait for tiddler "SyncMenuTestTiddler" to be added by watch-fs
|
||
When I clear test-id markers from logs
|
||
When I click menu "同步和备份 > 立即同步云端"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
Then the remote repository "{tmpDir}/remote-repo-menu.git" should contain commit with message "使用太记桌面版备份"
|
||
And the remote repository "{tmpDir}/remote-repo-menu.git" should contain file "tiddlers/SyncMenuTestTiddler.tid"
|
||
|
||
# Verify AI sync menu can push when there are no uncommitted changes but local is ahead
|
||
When I create file "{tmpDir}/wiki/tiddlers/SyncMenuAITestTiddler.tid" with content:
|
||
"""
|
||
created: 20250226090500000
|
||
modified: 20250226090500000
|
||
title: SyncMenuAITestTiddler
|
||
tags: SyncTest
|
||
|
||
This is a test tiddler for AI sync menu push behavior.
|
||
"""
|
||
Then I wait for tiddler "SyncMenuAITestTiddler" to be added by watch-fs
|
||
# First do local backup to create an unpushed commit
|
||
When I click menu "同步和备份 > 立即本地Git备份"
|
||
Then I wait for "git commit completed" log marker "[test-id-git-commit-complete]"
|
||
|
||
# Validate GitLog window can show real sync progress text from git-sync-js
|
||
When I click menu "同步和备份 > 查看历史备份"
|
||
And I switch to "gitHistory" window
|
||
And I wait for the page to load completely
|
||
When I click on a "actions tab" element with selector "button[role='tab']:has-text('操作'), button[role='tab']:has-text('Actions')"
|
||
Then I should see a "sync-to-remote button" element with selector "button[data-testid='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 should see a "git-sync snackbar message in GitLog" element with selector ".MuiAlert-message"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
And I should not see a "sync-to-remote button" element with selector "button[data-testid='sync-to-remote-button']"
|
||
When I switch to "main" window
|
||
|
||
# Create another unpushed commit for AI sync menu coverage
|
||
When I create file "{tmpDir}/wiki/tiddlers/SyncMenuAISecondTestTiddler.tid" with content:
|
||
"""
|
||
created: 20250226090600000
|
||
modified: 20250226090600000
|
||
title: SyncMenuAISecondTestTiddler
|
||
tags: SyncTest
|
||
|
||
This is a second test tiddler for AI sync menu push behavior.
|
||
"""
|
||
Then I wait for tiddler "SyncMenuAISecondTestTiddler" 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]"
|
||
When I clear test-id markers from logs
|
||
# Then use AI sync menu item to push that unpushed commit
|
||
When I click menu "同步和备份 > 立即同步云端（AI备份命名）"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
And the remote repository "{tmpDir}/remote-repo-menu.git" should contain file "tiddlers/SyncMenuAISecondTestTiddler.tid"
|
||
|
||
# ══════════════════════════════════════════════════════════════════
|
||
# Part 2: Diverged histories — auto-merge & same-line conflict
|
||
# ══════════════════════════════════════════════════════════════════
|
||
# Switch remote URL for diverged-history testing
|
||
When I create a bare git repository at "{tmpDir}/remote-diverge.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 type in "git url input" elements with selectors:
|
||
| text | selector |
|
||
| {tmpDir}/remote-diverge.git | label:has-text('Git仓库线上网址') + * input, label:has-text('Git Repo URL') + * input, input[aria-label='Git仓库线上网址'], input[aria-label='Git Repo URL'] |
|
||
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
|
||
|
||
# Part 2A: Append conflict (different lines) → auto-merge
|
||
When I create file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: AppendDoc
|
||
tags: Shared
|
||
|
||
Line one from initial commit.
|
||
|
||
|
||
Line three placeholder.
|
||
"""
|
||
Then I wait for tiddler "AppendDoc" to be added by watch-fs
|
||
When I clear test-id markers from logs
|
||
When I click menu "同步和备份 > 立即同步云端"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
|
||
When I push a commit to bare repository "{tmpDir}/remote-diverge.git" adding file "tiddlers/AppendDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: AppendDoc
|
||
tags: Shared
|
||
|
||
Line one from initial commit.
|
||
|
||
|
||
Line three placeholder.
|
||
Appended from external.
|
||
"""
|
||
|
||
When I create file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: AppendDoc
|
||
tags: Shared
|
||
|
||
Line one from initial commit.
|
||
Inserted from desktop.
|
||
|
||
Line three placeholder.
|
||
"""
|
||
Then I wait for tiddler "AppendDoc" to be updated by watch-fs
|
||
|
||
When I clear test-id markers from logs
|
||
When I click menu "同步和备份 > 立即同步云端"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
Then file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should contain text "Appended from external."
|
||
And file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should contain text "Inserted from desktop."
|
||
And file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should not contain text "<<<<<<< HEAD"
|
||
|
||
# Part 2B: Same-line edit conflict → conflict markers committed
|
||
When I create file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: ConflictDoc
|
||
tags: Conflict
|
||
|
||
Original line that will be edited.
|
||
"""
|
||
Then I wait for tiddler "ConflictDoc" to be added by watch-fs
|
||
When I clear test-id markers from logs
|
||
When I click menu "同步和备份 > 立即同步云端"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
|
||
When I push a commit to bare repository "{tmpDir}/remote-diverge.git" adding file "tiddlers/ConflictDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226110000000
|
||
title: ConflictDoc
|
||
tags: Conflict
|
||
|
||
External edited this line.
|
||
"""
|
||
|
||
When I create file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226120000000
|
||
title: ConflictDoc
|
||
tags: Conflict
|
||
|
||
Desktop edited this line.
|
||
"""
|
||
Then I wait for tiddler "ConflictDoc" to be updated by watch-fs
|
||
|
||
When I clear test-id markers from logs
|
||
When I click menu "同步和备份 > 立即同步云端"
|
||
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
||
Then file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" should contain text "External edited this line."
|
||
And file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" should contain text "Desktop edited this line."
|
||
|
||
# ══════════════════════════════════════════════════════════════════
|
||
# Part 3: Mobile HTTP git sync — fast-forward, merge, conflict
|
||
# ══════════════════════════════════════════════════════════════════
|
||
# Part 3A: Fast-forward push
|
||
When I clone workspace "wiki" via HTTP to "{tmpDir}/mobile-clone"
|
||
When I create file "{tmpDir}/mobile-clone/tiddlers/MobileNote.tid" with content:
|
||
"""
|
||
created: 20250226100000000
|
||
modified: 20250226100000000
|
||
title: MobileNote
|
||
tags: Mobile
|
||
|
||
Written on mobile phone.
|
||
"""
|
||
When I sync "{tmpDir}/mobile-clone" via HTTP to workspace "wiki"
|
||
Then file "{tmpDir}/wiki/tiddlers/MobileNote.tid" should contain text "Written on mobile phone."
|
||
|
||
# Part 3B: Non-overlapping merge with uncommitted desktop changes
|
||
When I create a tiddler "DesktopOnly" with tag "Desktop" in browser view
|
||
When I clone workspace "wiki" via HTTP to "{tmpDir}/mobile-clone2"
|
||
When I create a tiddler "DesktopNew" with tag "Desktop" in browser view
|
||
When I create file "{tmpDir}/mobile-clone2/tiddlers/MobileNew.tid" with content:
|
||
"""
|
||
created: 20250226120000000
|
||
modified: 20250226120000000
|
||
title: MobileNew
|
||
tags: Mobile
|
||
|
||
Mobile created this tiddler.
|
||
"""
|
||
When I sync "{tmpDir}/mobile-clone2" via HTTP to workspace "wiki"
|
||
Then file "{tmpDir}/wiki/tiddlers/MobileNew.tid" should contain text "Mobile created this tiddler."
|
||
And file "{tmpDir}/wiki/tiddlers/DesktopNew.tid" should contain text "Desktop"
|
||
|
||
# Part 3C: Same-name tiddler conflict — mobile metadata wins
|
||
When I clone workspace "wiki" via HTTP to "{tmpDir}/mobile-clone3"
|
||
When I create file "{tmpDir}/wiki/tiddlers/SharedNote.tid" with content:
|
||
"""
|
||
created: 20250226100000000
|
||
modified: 20250226100500000
|
||
title: SharedNote
|
||
tags: Desktop
|
||
|
||
Written on desktop.
|
||
"""
|
||
When I create file "{tmpDir}/mobile-clone3/tiddlers/SharedNote.tid" with content:
|
||
"""
|
||
created: 20250226100000000
|
||
modified: 20250226110000000
|
||
title: SharedNote
|
||
tags: Mobile
|
||
|
||
Written on mobile.
|
||
"""
|
||
When I sync "{tmpDir}/mobile-clone3" via HTTP to workspace "wiki"
|
||
Then file "{tmpDir}/wiki/tiddlers/SharedNote.tid" should contain text "tags: Mobile"
|
||
And file "{tmpDir}/wiki/tiddlers/SharedNote.tid" should contain text "modified: 20250226110000000"
|
||
And file "{tmpDir}/wiki/tiddlers/SharedNote.tid" should contain text "Written on mobile."
|
||
And file "{tmpDir}/wiki/tiddlers/SharedNote.tid" should not contain text "<<<<<<<"
|
||
And file "{tmpDir}/wiki/tiddlers/SharedNote.tid" should not contain text "======="
|
||
|
||
# Part 3D: Both sides edit existing tiddler — body merged, metadata from mobile
|
||
When I create file "{tmpDir}/wiki/tiddlers/Journal.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226090000000
|
||
title: Journal
|
||
tags: Original
|
||
|
||
Line one from original.
|
||
Line two from original.
|
||
"""
|
||
When I clone workspace "wiki" via HTTP to "{tmpDir}/mobile-clone4"
|
||
When I create file "{tmpDir}/wiki/tiddlers/Journal.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226100500000
|
||
title: Journal
|
||
tags: Original
|
||
|
||
Line one from original.
|
||
Line two from original.
|
||
Desktop added this line.
|
||
"""
|
||
When I create file "{tmpDir}/mobile-clone4/tiddlers/Journal.tid" with content:
|
||
"""
|
||
created: 20250226090000000
|
||
modified: 20250226110000000
|
||
title: Journal
|
||
tags: Original
|
||
|
||
Line one from original.
|
||
Line two from original.
|
||
Mobile added this line.
|
||
"""
|
||
When I sync "{tmpDir}/mobile-clone4" via HTTP to workspace "wiki"
|
||
Then file "{tmpDir}/wiki/tiddlers/Journal.tid" should contain text "modified: 20250226110000000"
|
||
And file "{tmpDir}/wiki/tiddlers/Journal.tid" should contain text "Mobile added this line."
|
||
And file "{tmpDir}/wiki/tiddlers/Journal.tid" should contain text "Desktop added this line."
|
||
And file "{tmpDir}/wiki/tiddlers/Journal.tid" should contain text "Line one from original."
|
||
And file "{tmpDir}/wiki/tiddlers/Journal.tid" should not contain text "<<<<<<<"
|