Merge commit 'cffe05a' into merge-main-13-seg13-copy-reveal

# Conflicts: # main.go
2026-03-29 13:35:59 -07:00
parent 4848b09be1 5a458c0c8c
commit a708e17b50
3 changed files with 251 additions and 6 deletions
@@ -884,7 +884,21 @@ func TestUIRestoresSelectedEntryHistoryVersion(t *testing.T) {
 	u.filter()
 	u.state.SelectedEntryID = "vault-console"
 	u.loadSelectedEntryIntoEditor()
-	u.historyIndex.SetText("0")
+
+	history := u.visibleHistory()
+	if len(history) != 1 {
+		t.Fatalf("len(visibleHistory()) = %d, want 1", len(history))
+	}
+	if history[0].Password != "token-1" {
+		t.Fatalf("visibleHistory()[0].Password = %q, want %q", history[0].Password, "token-1")
+	}
+
+	if err := u.selectHistoryVersion(0); err != nil {
+		t.Fatalf("selectHistoryVersion(0) error = %v", err)
+	}
+	if got := u.historyIndex.Text(); got != "0" {
+		t.Fatalf("historyIndex.Text() = %q, want %q", got, "0")
+	}

 	if err := u.restoreSelectedHistoryAction(); err != nil {
 		t.Fatalf("restoreSelectedHistoryAction() error = %v", err)
@@ -895,6 +909,68 @@ func TestUIRestoresSelectedEntryHistoryVersion(t *testing.T) {
 	}
 }

+func TestUISelectingEntryHistoryVersionTracksSelectedVersion(t *testing.T) {
+	t.Parallel()
+
+	u := newUIWithModel("desktop", vault.Model{
+		Entries: []vault.Entry{
+			{
+				ID:       "vault-console",
+				Title:    "Vault Console",
+				Username: "dannyocean",
+				Password: "token-2",
+				URL:      "https://vault.crew.example.invalid",
+				Path:     []string{"Root", "Internet"},
+				History: []vault.Entry{
+					{
+						ID:       "vault-console-h1",
+						Title:    "Vault Console",
+						Username: "dannyocean",
+						Password: "token-1",
+						URL:      "https://vault.crew.example.invalid",
+						Path:     []string{"Root", "Internet"},
+						Notes:    "previous token",
+					},
+					{
+						ID:       "vault-console-h0",
+						Title:    "Vault Console",
+						Username: "dannyocean",
+						Password: "token-0",
+						URL:      "https://vault.crew.example.invalid",
+						Path:     []string{"Root", "Internet"},
+						Notes:    "oldest token",
+					},
+				},
+			},
+		},
+	})
+	u.showEntriesSection()
+	u.currentPath = []string{"Root", "Internet"}
+	u.filter()
+	u.state.SelectedEntryID = "vault-console"
+	u.loadSelectedEntryIntoEditor()
+
+	history := u.visibleHistory()
+	if len(history) != 2 {
+		t.Fatalf("len(visibleHistory()) = %d, want 2", len(history))
+	}
+	if history[1].Notes != "oldest token" {
+		t.Fatalf("visibleHistory()[1].Notes = %q, want %q", history[1].Notes, "oldest token")
+	}
+
+	if err := u.selectHistoryVersion(1); err != nil {
+		t.Fatalf("selectHistoryVersion(1) error = %v", err)
+	}
+
+	selected, ok := u.selectedHistoryEntry()
+	if !ok {
+		t.Fatal("selectedHistoryEntry() ok = false, want true")
+	}
+	if selected.Password != "token-0" {
+		t.Fatalf("selectedHistoryEntry().Password = %q, want %q", selected.Password, "token-0")
+	}
+}
+
 func TestUIKeyboardShortcutActionsDispatchExpectedCommands(t *testing.T) {
 	t.Parallel()