Главная Обзор Помощь
Вход
arianagiroux
/
pingo
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0
Дерево: ec7382f5f3
Ветки Метки
pingo
/
issues
/
tests: cant test scroll percent?
/
reproduce.patch.023759d

reproduce.patch.023759d 12 KB
История Исходник

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198 
  1. diff --git a/go.mod b/go.mod
    2. 

  2. index fdfd67a..9b6b59c 100644
    3. 

  3. --- a/go.mod
    4. 

  4. +++ b/go.mod
    5. 

  5. @@ -4,7 +4,7 @@ go 1.25.6
    6. 

  6.  
    7. 

  7.  require (
    8. 

  8.  	github.com/NimbleMarkets/ntcharts v0.4.0
    9. 

  9. -	github.com/charmbracelet/bubbles v0.20.0
    10. 

  10. +	github.com/charmbracelet/bubbles v1.0.0
    11. 

  11.  	github.com/charmbracelet/bubbletea v1.3.10
    12. 

  12.  	github.com/charmbracelet/lipgloss v1.1.0
    13. 

  13.  	github.com/stretchr/testify v1.11.1
    14. 

  14. @@ -12,24 +12,27 @@ require (
    15. 

  15.  
    16. 

  16.  require (
    17. 

  17.  	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
    18. 

  18. -	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
    19. 

  19. -	github.com/charmbracelet/x/ansi v0.10.1 // indirect
    20. 

  20. -	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
    21. 

  21. -	github.com/charmbracelet/x/term v0.2.1 // indirect
    22. 

  22. +	github.com/charmbracelet/colorprofile v0.4.1 // indirect
    23. 

  23. +	github.com/charmbracelet/x/ansi v0.11.6 // indirect
    24. 

  24. +	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
    25. 

  25. +	github.com/charmbracelet/x/term v0.2.2 // indirect
    26. 

  26. +	github.com/clipperhouse/displaywidth v0.9.0 // indirect
    27. 

  27. +	github.com/clipperhouse/stringish v0.1.1 // indirect
    28. 

  28. +	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
    29. 

  29.  	github.com/davecgh/go-spew v1.1.1 // indirect
    30. 

  30.  	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
    31. 

  31.  	github.com/lrstanley/bubblezone v0.0.0-20240914071701-b48c55a5e78e // indirect
    32. 

  32. -	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
    33. 

  33. +	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
    34. 

  34.  	github.com/mattn/go-isatty v0.0.20 // indirect
    35. 

  35.  	github.com/mattn/go-localereader v0.0.1 // indirect
    36. 

  36. -	github.com/mattn/go-runewidth v0.0.16 // indirect
    37. 

  37. +	github.com/mattn/go-runewidth v0.0.19 // indirect
    38. 

  38.  	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
    39. 

  39.  	github.com/muesli/cancelreader v0.2.2 // indirect
    40. 

  40.  	github.com/muesli/termenv v0.16.0 // indirect
    41. 

  41.  	github.com/pmezard/go-difflib v1.0.0 // indirect
    42. 

  42.  	github.com/rivo/uniseg v0.4.7 // indirect
    43. 

  43.  	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
    44. 

  44. -	golang.org/x/sys v0.36.0 // indirect
    45. 

  45. +	golang.org/x/sys v0.38.0 // indirect
    46. 

  46.  	golang.org/x/text v0.20.0 // indirect
    47. 

  47.  	gopkg.in/yaml.v3 v3.0.1 // indirect
    48. 

  48.  )
    49. 

  49. diff --git a/go.sum b/go.sum
    50. 

  50. index 9bd8124..b8fcbb6 100644
    51. 

  51. --- a/go.sum
    52. 

  52. +++ b/go.sum
    53. 

  53. @@ -2,34 +2,40 @@ github.com/NimbleMarkets/ntcharts v0.4.0 h1:BtrER5o6s3xMAebhSDQZpdFdfVMGMpV4Qz8l
    54. 

  54.  github.com/NimbleMarkets/ntcharts v0.4.0/go.mod h1:zVeRqYkh2n59YPe1bflaSL4O2aD2ZemNmrbdEqZ70hk=
    55. 

  55.  github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
    56. 

  56.  github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
    57. 

  57. -github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
    58. 

  58. -github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
    59. 

  59. +github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
    60. 

  60. +github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
    61. 

  61.  github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
    62. 

  62.  github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
    63. 

  63. -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
    64. 

  64. -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
    65. 

  65. +github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
    66. 

  66. +github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
    67. 

  67.  github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
    68. 

  68.  github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
    69. 

  69. -github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
    70. 

  70. -github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
    71. 

  71. -github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
    72. 

  72. -github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
    73. 

  73. -github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
    74. 

  74. -github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
    75. 

  75. +github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
    76. 

  76. +github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
    77. 

  77. +github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
    78. 

  78. +github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
    79. 

  79. +github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
    80. 

  80. +github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
    81. 

  81. +github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
    82. 

  82. +github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
    83. 

  83. +github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
    84. 

  84. +github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
    85. 

  85. +github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
    86. 

  86. +github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
    87. 

  87.  github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
    88. 

  88.  github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
    89. 

  89.  github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
    90. 

  90.  github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
    91. 

  91.  github.com/lrstanley/bubblezone v0.0.0-20240914071701-b48c55a5e78e h1:OLwZ8xVaeVrru0xyeuOX+fne0gQTFEGlzfNjipCbxlU=
    92. 

  92.  github.com/lrstanley/bubblezone v0.0.0-20240914071701-b48c55a5e78e/go.mod h1:NQ34EGeu8FAYGBMDzwhfNJL8YQYoWZP5xYJPRDAwN3E=
    93. 

  93. -github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
    94. 

  94. -github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
    95. 

  95. +github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
    96. 

  96. +github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
    97. 

  97.  github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
    98. 

  98.  github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
    99. 

  99.  github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
    100. 

  100.  github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
    101. 

  101. -github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
    102. 

  102. -github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
    103. 

  103. +github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
    104. 

  104. +github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
    105. 

  105.  github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
    106. 

  106.  github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
    107. 

  107.  github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
    108. 

  108. @@ -38,19 +44,18 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
    109. 

  109.  github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
    110. 

  110.  github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
    111. 

  111.  github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
    112. 

  112. -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
    113. 

  113.  github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
    114. 

  114.  github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
    115. 

  115.  github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
    116. 

  116.  github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
    117. 

  117.  github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
    118. 

  118.  github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
    119. 

  119. -golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
    120. 

  120. -golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
    121. 

  121. +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
    122. 

  122. +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
    123. 

  123.  golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
    124. 

  124.  golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
    125. 

  125. -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
    126. 

  126. -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
    127. 

  127. +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
    128. 

  128. +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
    129. 

  129.  golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
    130. 

  130.  golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
    131. 

  131.  gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
    132. 

  132. diff --git a/tui.go b/tui.go
    133. 

  133. index d362feb..4650a4b 100644
    134. 

  134. --- a/tui.go
    135. 

  135. +++ b/tui.go
    136. 

  136. @@ -37,6 +37,7 @@ var (
    137. 

  137.  
    138. 

  138.  type ( // tea.Msg signatures
    139. 

  139.  	tickMsg       time.Time
    140. 

  140. +	scrollMsg     int // positive = scrolled up, negative = scrolled down
    141. 

  141.  	pollResultMsg struct {
    142. 

  142.  		results []float64
    143. 

  143.  		index   int
    144. 

  144. @@ -56,7 +57,7 @@ type Model struct {
    145. 

  145.  func InitialModel(addresses []string, speed time.Duration, chartHeight int) Model {
    146. 

  146.  	var model Model
    147. 

  147.  	model.viewport = viewport.New(0, 0)
    148. 

  148. -	model.viewport.MouseWheelEnabled = true
    149. 

  149. +	// model.viewport.MouseWheelEnabled = true
    150. 

  150.  	model.UpdateSpeed = speed
    151. 

  151.  	model.ChartHeight = chartHeight
    152. 

  152.  
    153. 

  153. @@ -143,9 +144,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
    154. 

  154.  	case tea.KeyMsg:
    155. 

  155.  		if k := msg.String(); k == "j" { // scroll down
    156. 

  156.  			m.viewport.LineDown(8)
    157. 

  157. +			cmd := func() tea.Msg { return scrollMsg(1) }
    158. 

  158. +			cmds = append(cmds, cmd)
    159. 

  159.  		} else if k == "k" { // scroll up
    160. 

  160.  			m.viewport.LineUp(8)
    161. 

  161. -		} else {
    162. 

  162. +			cmds = append(cmds, func() tea.Msg { return scrollMsg(-1) })
    163. 

  163. +		} else if k == "ctrl+c" || k == "q" {
    164. 

  164.  			return m, tea.Quit
    165. 

  165.  		}
    166. 

  166.  
    167. 

  167. diff --git a/tui_test.go b/tui_test.go
    168. 

  168. index 9887ecd..fdb377f 100644
    169. 

  169. --- a/tui_test.go
    170. 

  170. +++ b/tui_test.go
    171. 

  171. @@ -46,11 +46,10 @@ func Test_Model_Update_window_resize(t *testing.T) {
    172. 

  172.  }
    173. 

  173.  
    174. 

  174.  func Test_Model_Update_keymsg_j(t *testing.T) {
    175. 

  175. -	t.Skip()
    176. 

  176.  	testKey := tea.Key{Type: tea.KeyRunes, Runes: []rune{'j'}}
    177. 

  177.  	testMsg := tea.KeyMsg(testKey)
    178. 

  178.  	model := tea.Model(InitialModel([]string{"127.0.0.1", "127.0.0.1"}, time.Duration(time.Second*1), 0))
    179. 

  179. -	scrollPercent := model.(Model).viewport.ScrollPercent()
    180. 

  180. +
    181. 

  181.  	var msgs []tea.Msg
    182. 

  182.  	var cmd tea.Cmd
    183. 

  183.  	model, cmd = model.Update(tea.WindowSizeMsg{Width: 100, Height: 2000})
    184. 

  184. @@ -58,8 +57,12 @@ func Test_Model_Update_keymsg_j(t *testing.T) {
    185. 

  185.  		msgs = append(msgs, cmd())
    186. 

  186.  	}
    187. 

  187.  	msgs = append(msgs, testMsg)
    188. 

  188. -	model, _ = model.Update(msgs)
    189. 

  189. -	assert.NotEqual(t, scrollPercent, model.(Model).viewport.ScrollPercent())
    190. 

  190. +	var m tea.Cmd
    191. 

  191. +	_, m = model.Update(msgs)
    192. 

  192. +	assert.NotNil(t, m)
    193. 

  193. +	// value := m()
    194. 

  194. +	// assert.IsType(t, new(scrollMsg), value)
    195. 

  195. +	// assert.Equal(t, 1, value)
    196. 

  196.  }
    197. 

  197.  
    198. 

  198.  func Test_Model_View(t *testing.T)    {}
    199.