bagas/tunnel-please
Public Access
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 9 Wiki Activity

feat: upgrade bubbletea to v2
SonarQube Scan / SonarQube Trigger (push) Failing after 2m16s
Details

Browse Source
This commit is contained in:
bagas
2026-03-20 18:06:08 +07:00
parent 9dc3711875
commit 93d4fb48e7
9 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
session/interaction/interaction_test.go
+30 -30
View File
@@ -9,10 +9,10 @@ import (
"time"
"tunnel_pls/types"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"golang.org/x/crypto/ssh"
@@ -694,7 +694,7 @@ func TestInteraction_Integration(t *testing.T) {
func TestModel_Update_KeyMessages(t *testing.T) {
tests := []struct {
name string
key tea.KeyMsg
key tea.KeyPressMsg
showingComingSoon bool
editingSlug bool
showingCommands bool
@@ -702,25 +702,25 @@ func TestModel_Update_KeyMessages(t *testing.T) {
}{
{
name: "key press while showing coming soon",
key: tea.KeyMsg{Type: tea.KeyEnter},
key: tea.KeyPressMsg{Code: tea.KeyEnter},
showingComingSoon: true,
description: "should call comingSoonUpdate",
},
{
name: "key press while editing slug",
key: tea.KeyMsg{Type: tea.KeyEnter},
key: tea.KeyPressMsg{Code: tea.KeyEnter},
editingSlug: true,
description: "should call slugUpdate",
},
{
name: "key press while showing commands",
key: tea.KeyMsg{Type: tea.KeyEnter},
key: tea.KeyPressMsg{Code: tea.KeyEnter},
showingCommands: true,
description: "should call commandsUpdate",
},
{
name: "key press in dashboard view",
key: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
key: tea.KeyPressMsg{Code: 'c', Text: "c"},
description: "should call dashboardUpdate",
},
}
@@ -777,7 +777,7 @@ func TestModel_SlugUpdate(t *testing.T) {
tests := []struct {
name string
tunnelType types.TunnelType
keyMsg tea.KeyMsg
keyMsg tea.KeyPressMsg
inputValue string
setupMocks func(*MockSessionRegistry, *MockSlug, *MockRandom)
expectedEdit bool
@@ -787,21 +787,21 @@ func TestModel_SlugUpdate(t *testing.T) {
{
name: "escape key cancels editing",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false,
},
{
name: "ctrl+c cancels editing",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyCtrlC},
keyMsg: tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false,
},
{
name: "enter key saves valid slug",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
inputValue: "my-custom-slug",
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
ms.On("String").Return("old-slug")
@@ -816,7 +816,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{
name: "enter key with error shows error message",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
inputValue: "invalid",
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
ms.On("String").Return("old-slug")
@@ -831,7 +831,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{
name: "ctrl+r generates random slug",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyCtrlR},
keyMsg: tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
mr.On("String", 20).Return("random-generated-slug", nil)
},
@@ -841,7 +841,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{
name: "ctrl+r with error does nothing",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyCtrlR},
keyMsg: tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
mr.On("String", 20).Return("", assert.AnError)
},
@@ -850,14 +850,14 @@ func TestModel_SlugUpdate(t *testing.T) {
{
name: "regular key updates input",
tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
keyMsg: tea.KeyPressMsg{Code: 'a', Text: "a"},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: true,
},
{
name: "tcp tunnel exits editing immediately",
tunnelType: types.TunnelTypeTCP,
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
keyMsg: tea.KeyPressMsg{Code: 'a', Text: "a"},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false,
},
@@ -1006,19 +1006,19 @@ func TestModel_SlugView(t *testing.T) {
func TestModel_ComingSoonUpdate(t *testing.T) {
tests := []struct {
name string
keyMsg tea.KeyMsg
keyMsg tea.KeyPressMsg
}{
{
name: "any key dismisses coming soon",
keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
},
{
name: "escape key dismisses",
keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc},
},
{
name: "space key dismisses",
keyMsg: tea.KeyMsg{Type: tea.KeySpace},
keyMsg: tea.KeyPressMsg{Code: ' ', Text: " "},
},
}
@@ -1097,7 +1097,7 @@ func TestModel_ComingSoonView(t *testing.T) {
func TestModel_CommandsUpdate(t *testing.T) {
tests := []struct {
name string
keyMsg tea.KeyMsg
keyMsg tea.KeyPressMsg
selectedItem list.Item
expectCommands bool
expectEditSlug bool
@@ -1105,31 +1105,31 @@ func TestModel_CommandsUpdate(t *testing.T) {
}{
{
name: "escape key closes commands",
keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc},
expectCommands: false,
},
{
name: "q key closes commands",
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
keyMsg: tea.KeyPressMsg{Code: 'q', Text: "q"},
expectCommands: false,
},
{
name: "enter on slug command starts editing",
keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
selectedItem: commandItem{name: "slug", desc: "Set custom subdomain"},
expectCommands: false,
expectEditSlug: true,
},
{
name: "enter on tunnel-type shows coming soon",
keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
selectedItem: commandItem{name: "tunnel-type", desc: "Change tunnel type"},
expectCommands: false,
expectComingSoon: true,
},
{
name: "arrow key navigates list",
keyMsg: tea.KeyMsg{Type: tea.KeyDown},
keyMsg: tea.KeyPressMsg{Code: tea.KeyDown},
expectCommands: true,
},
}
@@ -1261,28 +1261,28 @@ func TestModel_CommandsView(t *testing.T) {
func TestModel_DashboardUpdate(t *testing.T) {
tests := []struct {
name string
keyMsg tea.KeyMsg
keyMsg tea.KeyPressMsg
expectQuit bool
expectCommands bool
}{
{
name: "q key quits",
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
keyMsg: tea.KeyPressMsg{Code: 'q', Text: "q"},
expectQuit: true,
},
{
name: "ctrl+c quits",
keyMsg: tea.KeyMsg{Type: tea.KeyCtrlC},
keyMsg: tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl},
expectQuit: true,
},
{
name: "c key opens commands",
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
keyMsg: tea.KeyPressMsg{Code: 'c', Text: "c"},
expectCommands: true,
},
{
name: "other keys do nothing",
keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'x'}},
keyMsg: tea.KeyPressMsg{Code: 'x', Text: "x"},
},
}