From 74fc699fabd50e3072d81242a9ade62ef8af34bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Sun, 22 Jun 2025 14:04:53 +0300 Subject: Fix task modification marking done and swap hotkeys --- internal/ui/table_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/ui/table_test.go') diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index 4e2679d..1daf7bf 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -162,7 +162,7 @@ func TestDoneHotkey(t *testing.T) { t.Fatalf("New: %v", err) } - mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'D'}}) + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'d'}}) m = mv.(Model) for i := 0; i < blinkCycles; i++ { mv, _ = m.Update(blinkMsg{}) @@ -211,7 +211,7 @@ func TestUndoHotkey(t *testing.T) { t.Fatalf("New: %v", err) } - mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'D'}}) + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'d'}}) m = mv.(Model) for i := 0; i < blinkCycles; i++ { mv, _ = m.Update(blinkMsg{}) @@ -269,7 +269,7 @@ func TestDueDateHotkey(t *testing.T) { t.Fatalf("New: %v", err) } - mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'d'}}) + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'D'}}) m = mv.(Model) for i := 0; i < 3; i++ { mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRight}) -- cgit v1.2.3 From e42bb79ed74cb975db0c4b8128b9014f0f6acf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Sun, 22 Jun 2025 14:16:15 +0300 Subject: Add task creation hotkey --- internal/ui/table_test.go | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'internal/ui/table_test.go') diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index 1daf7bf..f378973 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -442,6 +442,57 @@ func TestPriorityHotkey(t *testing.T) { } } +func TestAddHotkey(t *testing.T) { + tmp := t.TempDir() + taskPath := filepath.Join(tmp, "task") + addFile := filepath.Join(tmp, "add.txt") + + script := "#!/bin/sh\n" + + "if echo \"$@\" | grep -q export; then\n" + + " echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" + + " exit 0\n" + + "fi\n" + + "echo \"$@\" > " + addFile + "\n" + + if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil { + t.Fatal(err) + } + + origPath := os.Getenv("PATH") + os.Setenv("PATH", tmp+":"+origPath) + t.Cleanup(func() { os.Setenv("PATH", origPath) }) + + os.Setenv("TASKDATA", tmp) + os.Setenv("TASKRC", "/dev/null") + t.Cleanup(func() { + os.Unsetenv("TASKDATA") + os.Unsetenv("TASKRC") + }) + + m, err := New(nil) + if err != nil { + t.Fatalf("New: %v", err) + } + + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'+'}}) + m = mv.(Model) + for _, r := range "task" { + mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}}) + m = mv.(Model) + } + mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyEnter}) + m = mv.(Model) + + data, err := os.ReadFile(addFile) + if err != nil { + t.Fatalf("read add: %v", err) + } + + if strings.TrimSpace(string(data)) != "add task" { + t.Fatalf("add not called: %q", data) + } +} + func TestNavigationHotkeys(t *testing.T) { tmp := t.TempDir() taskPath := filepath.Join(tmp, "task") -- cgit v1.2.3 From dc1a6e83669dd22be4542833970d3251741ba1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:39:56 +0300 Subject: Fix add task hotkey --- internal/ui/table_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/ui/table_test.go') diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index f378973..365180c 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -476,7 +476,7 @@ func TestAddHotkey(t *testing.T) { mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'+'}}) m = mv.(Model) - for _, r := range "task" { + for _, r := range "foo due:today" { mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}}) m = mv.(Model) } @@ -488,7 +488,7 @@ func TestAddHotkey(t *testing.T) { t.Fatalf("read add: %v", err) } - if strings.TrimSpace(string(data)) != "add task" { + if strings.TrimSpace(string(data)) != "add foo due:today" { t.Fatalf("add not called: %q", data) } } -- cgit v1.2.3 From b140c36cd8bb3d20c7211fe672b9d5674c9f0d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:50:46 +0300 Subject: Add generic task command hotkey --- internal/ui/table_test.go | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'internal/ui/table_test.go') diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index 365180c..d94243b 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -493,6 +493,57 @@ func TestAddHotkey(t *testing.T) { } } +func TestTaskHotkey(t *testing.T) { + tmp := t.TempDir() + taskPath := filepath.Join(tmp, "task") + cmdFile := filepath.Join(tmp, "cmd.txt") + + script := "#!/bin/sh\n" + + "if echo \"$@\" | grep -q export; then\n" + + " echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" + + " exit 0\n" + + "fi\n" + + "echo \"$@\" > " + cmdFile + "\n" + + if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil { + t.Fatal(err) + } + + origPath := os.Getenv("PATH") + os.Setenv("PATH", tmp+":"+origPath) + t.Cleanup(func() { os.Setenv("PATH", origPath) }) + + os.Setenv("TASKDATA", tmp) + os.Setenv("TASKRC", "/dev/null") + t.Cleanup(func() { + os.Unsetenv("TASKDATA") + os.Unsetenv("TASKRC") + }) + + m, err := New(nil) + if err != nil { + t.Fatalf("New: %v", err) + } + + mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'T'}}) + m = mv.(Model) + for _, r := range "+bg modify +huhu" { + mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}}) + m = mv.(Model) + } + mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyEnter}) + m = mv.(Model) + + data, err := os.ReadFile(cmdFile) + if err != nil { + t.Fatalf("read cmd: %v", err) + } + + if strings.TrimSpace(string(data)) != "+bg modify +huhu" { + t.Fatalf("task not called: %q", data) + } +} + func TestNavigationHotkeys(t *testing.T) { tmp := t.TempDir() taskPath := filepath.Join(tmp, "task") -- cgit v1.2.3 From 8a83fbf747bda27f5859ad84c2f20a9afb753e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20B=C3=BCtow?= <1224732+snonux@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:58:00 +0300 Subject: Clean up unused RunArgs comments --- internal/ui/table_test.go | 51 ----------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'internal/ui/table_test.go') diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go index d94243b..365180c 100644 --- a/internal/ui/table_test.go +++ b/internal/ui/table_test.go @@ -493,57 +493,6 @@ func TestAddHotkey(t *testing.T) { } } -func TestTaskHotkey(t *testing.T) { - tmp := t.TempDir() - taskPath := filepath.Join(tmp, "task") - cmdFile := filepath.Join(tmp, "cmd.txt") - - script := "#!/bin/sh\n" + - "if echo \"$@\" | grep -q export; then\n" + - " echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0}'\n" + - " exit 0\n" + - "fi\n" + - "echo \"$@\" > " + cmdFile + "\n" - - if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil { - t.Fatal(err) - } - - origPath := os.Getenv("PATH") - os.Setenv("PATH", tmp+":"+origPath) - t.Cleanup(func() { os.Setenv("PATH", origPath) }) - - os.Setenv("TASKDATA", tmp) - os.Setenv("TASKRC", "/dev/null") - t.Cleanup(func() { - os.Unsetenv("TASKDATA") - os.Unsetenv("TASKRC") - }) - - m, err := New(nil) - if err != nil { - t.Fatalf("New: %v", err) - } - - mv, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'T'}}) - m = mv.(Model) - for _, r := range "+bg modify +huhu" { - mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}}) - m = mv.(Model) - } - mv, _ = m.Update(tea.KeyMsg{Type: tea.KeyEnter}) - m = mv.(Model) - - data, err := os.ReadFile(cmdFile) - if err != nil { - t.Fatalf("read cmd: %v", err) - } - - if strings.TrimSpace(string(data)) != "+bg modify +huhu" { - t.Fatalf("task not called: %q", data) - } -} - func TestNavigationHotkeys(t *testing.T) { tmp := t.TempDir() taskPath := filepath.Join(tmp, "task") -- cgit v1.2.3