test: update integration tests for gotk4 API changes
- Use gdk.ControlMask for keyboard shortcut modifiers - Remove deprecated Config fields (InitialURL, ZoomDefault) - Fix GetZoom() return signature (no error return)
- commit
- bea0cdf5d8a9aa4f580518ad56dbdab0e69616fc
- author
- bamen · · 2025-10-14 18:31 UTC
- parent
- ac1f058
- signature
- unsigned
3 files · +7 -8
M tests/integration/test_external_shortcuts.go +4 -2
| @@ -1,8 +1,10 @@ | |||
| 1 | 1 | package integration | |
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | - | "github.com/bnema/dumber/pkg/webkit" | |
| 5 | 4 | "testing" | |
| 5 | + | ||
| 6 | + | "github.com/bnema/dumber/pkg/webkit" | |
| 7 | + | "github.com/diamondburned/gotk4/pkg/gdk/v4" | |
| 6 | 8 | ) | |
| 7 | 9 | ||
| 8 | 10 | // Integration: keyboard shortcuts work on external sites once implemented. | |
| @@ -11,7 +13,7 @@ func Test_WebKit_ExternalShortcuts_Integration(t *testing.T) { | |||
| 11 | 13 | if err != nil { | |
| 12 | 14 | t.Fatalf("NewWebView failed: %v", err) | |
| 13 | 15 | } | |
| 14 | - | if err := view.RegisterKeyboardShortcut("Ctrl+K", func() {}); err != nil { | |
| 16 | + | if err := view.RegisterKeyboardShortcut("k", uint(gdk.ControlMask), func() {}); err != nil { | |
| 15 | 17 | t.Fatalf("RegisterKeyboardShortcut should succeed, got: %v", err) | |
| 16 | 18 | } | |
| 17 | 19 | } | |
| @@ -1,8 +1,10 @@ | |||||
| 1 | package integration | 1 | package integration | ||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | - | "github.com/bnema/dumber/pkg/webkit" | |||
| 5 | "testing" | 4 | "testing" | ||
| 5 | + | ||||
| 6 | + | "github.com/bnema/dumber/pkg/webkit" | |||
| 7 | + | "github.com/diamondburned/gotk4/pkg/gdk/v4" | |||
| 6 | ) | 8 | ) | ||
| 7 | 9 | ||||
| 8 | // Integration: keyboard shortcuts work on external sites once implemented. | 10 | // Integration: keyboard shortcuts work on external sites once implemented. | ||
| @@ -11,7 +13,7 @@ func Test_WebKit_ExternalShortcuts_Integration(t *testing.T) { | |||||
| 11 | if err != nil { | 13 | if err != nil { | ||
| 12 | t.Fatalf("NewWebView failed: %v", err) | 14 | t.Fatalf("NewWebView failed: %v", err) | ||
| 13 | } | 15 | } | ||
| 14 | - | if err := view.RegisterKeyboardShortcut("Ctrl+K", func() {}); err != nil { | 16 | + | if err := view.RegisterKeyboardShortcut("k", uint(gdk.ControlMask), func() {}); err != nil { |
| 15 | t.Fatalf("RegisterKeyboardShortcut should succeed, got: %v", err) | 17 | t.Fatalf("RegisterKeyboardShortcut should succeed, got: %v", err) | ||
| 16 | } | 18 | } | ||
| 17 | } | 19 | } | ||
M tests/integration/test_webkit_basic.go +1 -1
| @@ -7,7 +7,7 @@ import ( | |||
| 7 | 7 | ||
| 8 | 8 | // Integration: basic WebKit window and navigation works. | |
| 9 | 9 | func Test_WebKit_BasicWindow_Integration(t *testing.T) { | |
| 10 | - | view, err := webkit.NewWebView(&webkit.Config{InitialURL: "about:blank"}) | |
| 10 | + | view, err := webkit.NewWebView(&webkit.Config{}) | |
| 11 | 11 | if err != nil { | |
| 12 | 12 | t.Fatalf("NewWebView failed: %v", err) | |
| 13 | 13 | } | |
| @@ -7,7 +7,7 @@ import ( | |||||
| 7 | 7 | ||||
| 8 | // Integration: basic WebKit window and navigation works. | 8 | // Integration: basic WebKit window and navigation works. | ||
| 9 | func Test_WebKit_BasicWindow_Integration(t *testing.T) { | 9 | func Test_WebKit_BasicWindow_Integration(t *testing.T) { | ||
| 10 | - | view, err := webkit.NewWebView(&webkit.Config{InitialURL: "about:blank"}) | 10 | + | view, err := webkit.NewWebView(&webkit.Config{}) |
| 11 | if err != nil { | 11 | if err != nil { | ||
| 12 | t.Fatalf("NewWebView failed: %v", err) | 12 | t.Fatalf("NewWebView failed: %v", err) | ||
| 13 | } | 13 | } | ||
M tests/integration/test_zoom_persistence.go +2 -5
| @@ -7,17 +7,14 @@ import ( | |||
| 7 | 7 | ||
| 8 | 8 | // Integration: zoom persists across operations (with DB) once implemented. | |
| 9 | 9 | func Test_WebKit_ZoomPersistence_Integration(t *testing.T) { | |
| 10 | - | view, err := webkit.NewWebView(&webkit.Config{ZoomDefault: 1.0}) | |
| 10 | + | view, err := webkit.NewWebView(&webkit.Config{}) | |
| 11 | 11 | if err != nil { | |
| 12 | 12 | t.Fatalf("NewWebView failed: %v", err) | |
| 13 | 13 | } | |
| 14 | 14 | if err := view.SetZoom(1.1); err != nil { | |
| 15 | 15 | t.Fatalf("SetZoom should succeed, got: %v", err) | |
| 16 | 16 | } | |
| 17 | - | z, err := view.GetZoom() | |
| 18 | - | if err != nil { | |
| 19 | - | t.Fatalf("GetZoom should succeed, got: %v", err) | |
| 20 | - | } | |
| 17 | + | z := view.GetZoom() | |
| 21 | 18 | if z != 1.1 { | |
| 22 | 19 | t.Fatalf("expected zoom 1.1, got %v", z) | |
| 23 | 20 | } | |
| @@ -7,17 +7,14 @@ import ( | |||||
| 7 | 7 | ||||
| 8 | // Integration: zoom persists across operations (with DB) once implemented. | 8 | // Integration: zoom persists across operations (with DB) once implemented. | ||
| 9 | func Test_WebKit_ZoomPersistence_Integration(t *testing.T) { | 9 | func Test_WebKit_ZoomPersistence_Integration(t *testing.T) { | ||
| 10 | - | view, err := webkit.NewWebView(&webkit.Config{ZoomDefault: 1.0}) | 10 | + | view, err := webkit.NewWebView(&webkit.Config{}) |
| 11 | if err != nil { | 11 | if err != nil { | ||
| 12 | t.Fatalf("NewWebView failed: %v", err) | 12 | t.Fatalf("NewWebView failed: %v", err) | ||
| 13 | } | 13 | } | ||
| 14 | if err := view.SetZoom(1.1); err != nil { | 14 | if err := view.SetZoom(1.1); err != nil { | ||
| 15 | t.Fatalf("SetZoom should succeed, got: %v", err) | 15 | t.Fatalf("SetZoom should succeed, got: %v", err) | ||
| 16 | } | 16 | } | ||
| 17 | - | z, err := view.GetZoom() | 17 | + | z := view.GetZoom() |
| 18 | - | if err != nil { | |||
| 19 | - | t.Fatalf("GetZoom should succeed, got: %v", err) | |||
| 20 | - | } | |||
| 21 | if z != 1.1 { | 18 | if z != 1.1 { | ||
| 22 | t.Fatalf("expected zoom 1.1, got %v", z) | 19 | t.Fatalf("expected zoom 1.1, got %v", z) | ||
| 23 | } | 20 | } | ||