detached ad3456a

chore(test): update ui tests and regenerate mocks

commit
ad3456a1546583da156c9d88d3de20fc3255d067
author
bnema · · 2025-12-21 21:27 UTC
parent
b27d495
signature
unsigned
5 files · +72 -153
Unified
UnifiedSplit
M .mockery.yaml +4 -5
@@ -1,12 +1,11 @@
11 template: testify
22 template-data:
33 unroll-variadic: true
4-filename: mocks.go
54 packages:
65 github.com/bnema/dumber/internal/application/port:
76 config:
87 dir: '{{.InterfaceDir}}/mocks'
9- structname: Mock{{.InterfaceName}}
8+ filename: mocks.go
109 pkgname: mocks
1110 interfaces:
1211 WebView: {}
@@ -15,7 +14,7 @@ packages:
1514 github.com/bnema/dumber/internal/domain/repository:
1615 config:
1716 dir: '{{.InterfaceDir}}/mocks'
18- structname: Mock{{.InterfaceName}}
17+ filename: mocks.go
1918 pkgname: mocks
2019 interfaces:
2120 ContentWhitelistRepository: {}
@@ -27,7 +26,7 @@ packages:
2726 github.com/bnema/dumber/internal/infrastructure/filtering:
2827 config:
2928 dir: '{{.InterfaceDir}}/mocks'
30- structname: Mock{{.InterfaceName}}
29+ filename: mocks.go
3130 pkgname: mocks
3231 interfaces:
3332 FilterDownloader: {}
@@ -35,7 +34,7 @@ packages:
3534 github.com/bnema/dumber/internal/ui/layout:
3635 config:
3736 dir: '{{.InterfaceDir}}/mocks'
38- structname: Mock{{.InterfaceName}}
37+ filename: mocks.go
3938 pkgname: mocks
4039 interfaces:
4140 BoxWidget: {}
@@ -1,12 +1,11 @@
1 template: testify1 template: testify
2 template-data:2 template-data:
3 unroll-variadic: true3 unroll-variadic: true
4-filename: mocks.go
5 packages:4 packages:
6 github.com/bnema/dumber/internal/application/port:5 github.com/bnema/dumber/internal/application/port:
7 config:6 config:
8 dir: '{{.InterfaceDir}}/mocks'7 dir: '{{.InterfaceDir}}/mocks'
9- structname: Mock{{.InterfaceName}}8+ filename: mocks.go
10 pkgname: mocks9 pkgname: mocks
11 interfaces:10 interfaces:
12 WebView: {}11 WebView: {}
@@ -15,7 +14,7 @@ packages:
15 github.com/bnema/dumber/internal/domain/repository:14 github.com/bnema/dumber/internal/domain/repository:
16 config:15 config:
17 dir: '{{.InterfaceDir}}/mocks'16 dir: '{{.InterfaceDir}}/mocks'
18- structname: Mock{{.InterfaceName}}17+ filename: mocks.go
19 pkgname: mocks18 pkgname: mocks
20 interfaces:19 interfaces:
21 ContentWhitelistRepository: {}20 ContentWhitelistRepository: {}
@@ -27,7 +26,7 @@ packages:
27 github.com/bnema/dumber/internal/infrastructure/filtering:26 github.com/bnema/dumber/internal/infrastructure/filtering:
28 config:27 config:
29 dir: '{{.InterfaceDir}}/mocks'28 dir: '{{.InterfaceDir}}/mocks'
30- structname: Mock{{.InterfaceName}}29+ filename: mocks.go
31 pkgname: mocks30 pkgname: mocks
32 interfaces:31 interfaces:
33 FilterDownloader: {}32 FilterDownloader: {}
@@ -35,7 +34,7 @@ packages:
35 github.com/bnema/dumber/internal/ui/layout:34 github.com/bnema/dumber/internal/ui/layout:
36 config:35 config:
37 dir: '{{.InterfaceDir}}/mocks'36 dir: '{{.InterfaceDir}}/mocks'
38- structname: Mock{{.InterfaceName}}37+ filename: mocks.go
39 pkgname: mocks38 pkgname: mocks
40 interfaces:39 interfaces:
41 BoxWidget: {}40 BoxWidget: {}
M internal/application/port/mocks/mocks.go +32 -32
@@ -203,92 +203,92 @@ func (_c *MockWebView_EstimatedProgress_Call) RunAndReturn(run func() float64) *
203203 return _c
204204 }
205205
206-// GetZoomLevel provides a mock function for the type MockWebView
207-func (_mock *MockWebView) GetZoomLevel() float64 {
206+// GetFindController provides a mock function for the type MockWebView
207+func (_mock *MockWebView) GetFindController() port.FindController {
208208 ret := _mock.Called()
209209
210210 if len(ret) == 0 {
211- panic("no return value specified for GetZoomLevel")
211+ panic("no return value specified for GetFindController")
212212 }
213213
214- var r0 float64
215- if returnFunc, ok := ret.Get(0).(func() float64); ok {
214+ var r0 port.FindController
215+ if returnFunc, ok := ret.Get(0).(func() port.FindController); ok {
216216 r0 = returnFunc()
217217 } else {
218- r0 = ret.Get(0).(float64)
218+ if ret.Get(0) != nil {
219+ r0 = ret.Get(0).(port.FindController)
220+ }
219221 }
220222 return r0
221223 }
222224
223-// MockWebView_GetZoomLevel_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetZoomLevel'
224-type MockWebView_GetZoomLevel_Call struct {
225+// MockWebView_GetFindController_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFindController'
226+type MockWebView_GetFindController_Call struct {
225227 *mock.Call
226228 }
227229
228-// GetZoomLevel is a helper method to define mock.On call
229-func (_e *MockWebView_Expecter) GetZoomLevel() *MockWebView_GetZoomLevel_Call {
230- return &MockWebView_GetZoomLevel_Call{Call: _e.mock.On("GetZoomLevel")}
230+// GetFindController is a helper method to define mock.On call
231+func (_e *MockWebView_Expecter) GetFindController() *MockWebView_GetFindController_Call {
232+ return &MockWebView_GetFindController_Call{Call: _e.mock.On("GetFindController")}
231233 }
232234
233-func (_c *MockWebView_GetZoomLevel_Call) Run(run func()) *MockWebView_GetZoomLevel_Call {
235+func (_c *MockWebView_GetFindController_Call) Run(run func()) *MockWebView_GetFindController_Call {
234236 _c.Call.Run(func(args mock.Arguments) {
235237 run()
236238 })
237239 return _c
238240 }
239241
240-func (_c *MockWebView_GetZoomLevel_Call) Return(f float64) *MockWebView_GetZoomLevel_Call {
241- _c.Call.Return(f)
242+func (_c *MockWebView_GetFindController_Call) Return(findController port.FindController) *MockWebView_GetFindController_Call {
243+ _c.Call.Return(findController)
242244 return _c
243245 }
244246
245-func (_c *MockWebView_GetZoomLevel_Call) RunAndReturn(run func() float64) *MockWebView_GetZoomLevel_Call {
247+func (_c *MockWebView_GetFindController_Call) RunAndReturn(run func() port.FindController) *MockWebView_GetFindController_Call {
246248 _c.Call.Return(run)
247249 return _c
248250 }
249251
250-// GetFindController provides a mock function for the type MockWebView
251-func (_mock *MockWebView) GetFindController() port.FindController {
252+// GetZoomLevel provides a mock function for the type MockWebView
253+func (_mock *MockWebView) GetZoomLevel() float64 {
252254 ret := _mock.Called()
253255
254256 if len(ret) == 0 {
255- panic("no return value specified for GetFindController")
257+ panic("no return value specified for GetZoomLevel")
256258 }
257259
258- var r0 port.FindController
259- if returnFunc, ok := ret.Get(0).(func() port.FindController); ok {
260+ var r0 float64
261+ if returnFunc, ok := ret.Get(0).(func() float64); ok {
260262 r0 = returnFunc()
261263 } else {
262- if ret.Get(0) != nil {
263- r0 = ret.Get(0).(port.FindController)
264- }
264+ r0 = ret.Get(0).(float64)
265265 }
266266 return r0
267267 }
268268
269-// MockWebView_GetFindController_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFindController'
270-type MockWebView_GetFindController_Call struct {
269+// MockWebView_GetZoomLevel_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetZoomLevel'
270+type MockWebView_GetZoomLevel_Call struct {
271271 *mock.Call
272272 }
273273
274-// GetFindController is a helper method to define mock.On call
275-func (_e *MockWebView_Expecter) GetFindController() *MockWebView_GetFindController_Call {
276- return &MockWebView_GetFindController_Call{Call: _e.mock.On("GetFindController")}
274+// GetZoomLevel is a helper method to define mock.On call
275+func (_e *MockWebView_Expecter) GetZoomLevel() *MockWebView_GetZoomLevel_Call {
276+ return &MockWebView_GetZoomLevel_Call{Call: _e.mock.On("GetZoomLevel")}
277277 }
278278
279-func (_c *MockWebView_GetFindController_Call) Run(run func()) *MockWebView_GetFindController_Call {
279+func (_c *MockWebView_GetZoomLevel_Call) Run(run func()) *MockWebView_GetZoomLevel_Call {
280280 _c.Call.Run(func(args mock.Arguments) {
281281 run()
282282 })
283283 return _c
284284 }
285285
286-func (_c *MockWebView_GetFindController_Call) Return(controller port.FindController) *MockWebView_GetFindController_Call {
287- _c.Call.Return(controller)
286+func (_c *MockWebView_GetZoomLevel_Call) Return(f float64) *MockWebView_GetZoomLevel_Call {
287+ _c.Call.Return(f)
288288 return _c
289289 }
290290
291-func (_c *MockWebView_GetFindController_Call) RunAndReturn(run func() port.FindController) *MockWebView_GetFindController_Call {
291+func (_c *MockWebView_GetZoomLevel_Call) RunAndReturn(run func() float64) *MockWebView_GetZoomLevel_Call {
292292 _c.Call.Return(run)
293293 return _c
294294 }
@@ -203,92 +203,92 @@ func (_c *MockWebView_EstimatedProgress_Call) RunAndReturn(run func() float64) *
203 return _c203 return _c
204 }204 }
205 205
206-// GetZoomLevel provides a mock function for the type MockWebView206+// GetFindController provides a mock function for the type MockWebView
207-func (_mock *MockWebView) GetZoomLevel() float64 {207+func (_mock *MockWebView) GetFindController() port.FindController {
208 ret := _mock.Called()208 ret := _mock.Called()
209 209
210 if len(ret) == 0 {210 if len(ret) == 0 {
211- panic("no return value specified for GetZoomLevel")211+ panic("no return value specified for GetFindController")
212 }212 }
213 213
214- var r0 float64214+ var r0 port.FindController
215- if returnFunc, ok := ret.Get(0).(func() float64); ok {215+ if returnFunc, ok := ret.Get(0).(func() port.FindController); ok {
216 r0 = returnFunc()216 r0 = returnFunc()
217 } else {217 } else {
218- r0 = ret.Get(0).(float64)218+ if ret.Get(0) != nil {
219+ r0 = ret.Get(0).(port.FindController)
220+ }
219 }221 }
220 return r0222 return r0
221 }223 }
222 224
223-// MockWebView_GetZoomLevel_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetZoomLevel'225+// MockWebView_GetFindController_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFindController'
224-type MockWebView_GetZoomLevel_Call struct {226+type MockWebView_GetFindController_Call struct {
225 *mock.Call227 *mock.Call
226 }228 }
227 229
228-// GetZoomLevel is a helper method to define mock.On call230+// GetFindController is a helper method to define mock.On call
229-func (_e *MockWebView_Expecter) GetZoomLevel() *MockWebView_GetZoomLevel_Call {231+func (_e *MockWebView_Expecter) GetFindController() *MockWebView_GetFindController_Call {
230- return &MockWebView_GetZoomLevel_Call{Call: _e.mock.On("GetZoomLevel")}232+ return &MockWebView_GetFindController_Call{Call: _e.mock.On("GetFindController")}
231 }233 }
232 234
233-func (_c *MockWebView_GetZoomLevel_Call) Run(run func()) *MockWebView_GetZoomLevel_Call {235+func (_c *MockWebView_GetFindController_Call) Run(run func()) *MockWebView_GetFindController_Call {
234 _c.Call.Run(func(args mock.Arguments) {236 _c.Call.Run(func(args mock.Arguments) {
235 run()237 run()
236 })238 })
237 return _c239 return _c
238 }240 }
239 241
240-func (_c *MockWebView_GetZoomLevel_Call) Return(f float64) *MockWebView_GetZoomLevel_Call {242+func (_c *MockWebView_GetFindController_Call) Return(findController port.FindController) *MockWebView_GetFindController_Call {
241- _c.Call.Return(f)243+ _c.Call.Return(findController)
242 return _c244 return _c
243 }245 }
244 246
245-func (_c *MockWebView_GetZoomLevel_Call) RunAndReturn(run func() float64) *MockWebView_GetZoomLevel_Call {247+func (_c *MockWebView_GetFindController_Call) RunAndReturn(run func() port.FindController) *MockWebView_GetFindController_Call {
246 _c.Call.Return(run)248 _c.Call.Return(run)
247 return _c249 return _c
248 }250 }
249 251
250-// GetFindController provides a mock function for the type MockWebView252+// GetZoomLevel provides a mock function for the type MockWebView
251-func (_mock *MockWebView) GetFindController() port.FindController {253+func (_mock *MockWebView) GetZoomLevel() float64 {
252 ret := _mock.Called()254 ret := _mock.Called()
253 255
254 if len(ret) == 0 {256 if len(ret) == 0 {
255- panic("no return value specified for GetFindController")257+ panic("no return value specified for GetZoomLevel")
256 }258 }
257 259
258- var r0 port.FindController260+ var r0 float64
259- if returnFunc, ok := ret.Get(0).(func() port.FindController); ok {261+ if returnFunc, ok := ret.Get(0).(func() float64); ok {
260 r0 = returnFunc()262 r0 = returnFunc()
261 } else {263 } else {
262- if ret.Get(0) != nil {264+ r0 = ret.Get(0).(float64)
263- r0 = ret.Get(0).(port.FindController)
264- }
265 }265 }
266 return r0266 return r0
267 }267 }
268 268
269-// MockWebView_GetFindController_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetFindController'269+// MockWebView_GetZoomLevel_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetZoomLevel'
270-type MockWebView_GetFindController_Call struct {270+type MockWebView_GetZoomLevel_Call struct {
271 *mock.Call271 *mock.Call
272 }272 }
273 273
274-// GetFindController is a helper method to define mock.On call274+// GetZoomLevel is a helper method to define mock.On call
275-func (_e *MockWebView_Expecter) GetFindController() *MockWebView_GetFindController_Call {275+func (_e *MockWebView_Expecter) GetZoomLevel() *MockWebView_GetZoomLevel_Call {
276- return &MockWebView_GetFindController_Call{Call: _e.mock.On("GetFindController")}276+ return &MockWebView_GetZoomLevel_Call{Call: _e.mock.On("GetZoomLevel")}
277 }277 }
278 278
279-func (_c *MockWebView_GetFindController_Call) Run(run func()) *MockWebView_GetFindController_Call {279+func (_c *MockWebView_GetZoomLevel_Call) Run(run func()) *MockWebView_GetZoomLevel_Call {
280 _c.Call.Run(func(args mock.Arguments) {280 _c.Call.Run(func(args mock.Arguments) {
281 run()281 run()
282 })282 })
283 return _c283 return _c
284 }284 }
285 285
286-func (_c *MockWebView_GetFindController_Call) Return(controller port.FindController) *MockWebView_GetFindController_Call {286+func (_c *MockWebView_GetZoomLevel_Call) Return(f float64) *MockWebView_GetZoomLevel_Call {
287- _c.Call.Return(controller)287+ _c.Call.Return(f)
288 return _c288 return _c
289 }289 }
290 290
291-func (_c *MockWebView_GetFindController_Call) RunAndReturn(run func() port.FindController) *MockWebView_GetFindController_Call {291+func (_c *MockWebView_GetZoomLevel_Call) RunAndReturn(run func() float64) *MockWebView_GetZoomLevel_Call {
292 _c.Call.Return(run)292 _c.Call.Return(run)
293 return _c293 return _c
294 }294 }
M internal/ui/component/pane_view_test.go +21 -99
@@ -3,7 +3,6 @@ package component_test
33 import (
44 "testing"
55
6- "github.com/jwijenbergh/puregotk/v4/gtk"
76 "github.com/stretchr/testify/assert"
87 "github.com/stretchr/testify/require"
98
@@ -18,7 +17,6 @@ func TestNewPaneView_CreatesOverlay(t *testing.T) {
1817 mockFactory := mocks.NewMockWidgetFactory(t)
1918 mockOverlay := mocks.NewMockOverlayWidget(t)
2019 mockBorderBox := mocks.NewMockBoxWidget(t)
21- mockProgressBar := mocks.NewMockProgressBarWidget(t)
2220 mockWebView := mocks.NewMockWidget(t)
2321
2422 paneID := entity.PaneID("pane-1")
@@ -40,19 +38,6 @@ func TestNewPaneView_CreatesOverlay(t *testing.T) {
4038 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
4139 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
4240
43- // Progress bar setup
44- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
45- mockProgressBar.EXPECT().AddCssClass("osd").Once()
46- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
47- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
48- mockProgressBar.EXPECT().SetHexpand(true).Once()
49- mockProgressBar.EXPECT().SetCanTarget(false).Once()
50- mockProgressBar.EXPECT().SetCanFocus(false).Once()
51- mockProgressBar.EXPECT().SetVisible(false).Once()
52- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
53- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
54- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
55-
5641 // Act
5742 pv := component.NewPaneView(mockFactory, paneID, mockWebView)
5843
@@ -67,7 +52,6 @@ func TestNewPaneView_NilWebView(t *testing.T) {
6752 mockFactory := mocks.NewMockWidgetFactory(t)
6853 mockOverlay := mocks.NewMockOverlayWidget(t)
6954 mockBorderBox := mocks.NewMockBoxWidget(t)
70- mockProgressBar := mocks.NewMockProgressBarWidget(t)
7155
7256 paneID := entity.PaneID("pane-1")
7357
@@ -87,19 +71,6 @@ func TestNewPaneView_NilWebView(t *testing.T) {
8771 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
8872 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
8973
90- // Progress bar setup
91- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
92- mockProgressBar.EXPECT().AddCssClass("osd").Once()
93- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
94- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
95- mockProgressBar.EXPECT().SetHexpand(true).Once()
96- mockProgressBar.EXPECT().SetCanTarget(false).Once()
97- mockProgressBar.EXPECT().SetCanFocus(false).Once()
98- mockProgressBar.EXPECT().SetVisible(false).Once()
99- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
100- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
101- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
102-
10374 // Act
10475 pv := component.NewPaneView(mockFactory, paneID, nil)
10576
@@ -113,10 +84,9 @@ func TestSetActive_True_AddsCSSClass(t *testing.T) {
11384 mockFactory := mocks.NewMockWidgetFactory(t)
11485 mockOverlay := mocks.NewMockOverlayWidget(t)
11586 mockBorderBox := mocks.NewMockBoxWidget(t)
116- mockProgressBar := mocks.NewMockProgressBarWidget(t)
11787 mockWebView := mocks.NewMockWidget(t)
11888
119- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
89+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
12090
12191 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
12292
@@ -135,10 +105,9 @@ func TestSetActive_False_RemovesCSSClass(t *testing.T) {
135105 mockFactory := mocks.NewMockWidgetFactory(t)
136106 mockOverlay := mocks.NewMockOverlayWidget(t)
137107 mockBorderBox := mocks.NewMockBoxWidget(t)
138- mockProgressBar := mocks.NewMockProgressBarWidget(t)
139108 mockWebView := mocks.NewMockWidget(t)
140109
141- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
110+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
142111
143112 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
144113
@@ -161,10 +130,9 @@ func TestSetActive_NoChangeWhenSameState(t *testing.T) {
161130 mockFactory := mocks.NewMockWidgetFactory(t)
162131 mockOverlay := mocks.NewMockOverlayWidget(t)
163132 mockBorderBox := mocks.NewMockBoxWidget(t)
164- mockProgressBar := mocks.NewMockProgressBarWidget(t)
165133 mockWebView := mocks.NewMockWidget(t)
166134
167- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
135+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
168136
169137 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
170138
@@ -180,11 +148,10 @@ func TestPaneID_ReturnsPaneID(t *testing.T) {
180148 mockFactory := mocks.NewMockWidgetFactory(t)
181149 mockOverlay := mocks.NewMockOverlayWidget(t)
182150 mockBorderBox := mocks.NewMockBoxWidget(t)
183- mockProgressBar := mocks.NewMockProgressBarWidget(t)
184151 mockWebView := mocks.NewMockWidget(t)
185152
186153 paneID := entity.PaneID("test-pane-123")
187- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
154+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
188155
189156 pv := component.NewPaneView(mockFactory, paneID, mockWebView)
190157
@@ -200,10 +167,9 @@ func TestWebViewWidget_ReturnsWebView(t *testing.T) {
200167 mockFactory := mocks.NewMockWidgetFactory(t)
201168 mockOverlay := mocks.NewMockOverlayWidget(t)
202169 mockBorderBox := mocks.NewMockBoxWidget(t)
203- mockProgressBar := mocks.NewMockProgressBarWidget(t)
204170 mockWebView := mocks.NewMockWidget(t)
205171
206- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
172+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
207173
208174 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
209175
@@ -219,11 +185,10 @@ func TestSetWebViewWidget_ReplacesWidget(t *testing.T) {
219185 mockFactory := mocks.NewMockWidgetFactory(t)
220186 mockOverlay := mocks.NewMockOverlayWidget(t)
221187 mockBorderBox := mocks.NewMockBoxWidget(t)
222- mockProgressBar := mocks.NewMockProgressBarWidget(t)
223188 mockOldWebView := mocks.NewMockWidget(t)
224189 mockNewWebView := mocks.NewMockWidget(t)
225190
226- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockOldWebView)
191+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockOldWebView)
227192
228193 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockOldWebView)
229194
@@ -245,10 +210,9 @@ func TestSetWebViewWidget_FromNil(t *testing.T) {
245210 mockFactory := mocks.NewMockWidgetFactory(t)
246211 mockOverlay := mocks.NewMockOverlayWidget(t)
247212 mockBorderBox := mocks.NewMockBoxWidget(t)
248- mockProgressBar := mocks.NewMockProgressBarWidget(t)
249213 mockNewWebView := mocks.NewMockWidget(t)
250214
251- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)
215+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
252216
253217 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
254218
@@ -269,10 +233,9 @@ func TestGrabFocus_DelegatesToWebView(t *testing.T) {
269233 mockFactory := mocks.NewMockWidgetFactory(t)
270234 mockOverlay := mocks.NewMockOverlayWidget(t)
271235 mockBorderBox := mocks.NewMockBoxWidget(t)
272- mockProgressBar := mocks.NewMockProgressBarWidget(t)
273236 mockWebView := mocks.NewMockWidget(t)
274237
275- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
238+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
276239
277240 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
278241
@@ -290,9 +253,8 @@ func TestGrabFocus_NilWebView_ReturnsFalse(t *testing.T) {
290253 mockFactory := mocks.NewMockWidgetFactory(t)
291254 mockOverlay := mocks.NewMockOverlayWidget(t)
292255 mockBorderBox := mocks.NewMockBoxWidget(t)
293- mockProgressBar := mocks.NewMockProgressBarWidget(t)
294256
295- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)
257+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
296258
297259 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
298260
@@ -308,10 +270,9 @@ func TestHasFocus_DelegatesToWebView(t *testing.T) {
308270 mockFactory := mocks.NewMockWidgetFactory(t)
309271 mockOverlay := mocks.NewMockOverlayWidget(t)
310272 mockBorderBox := mocks.NewMockBoxWidget(t)
311- mockProgressBar := mocks.NewMockProgressBarWidget(t)
312273 mockWebView := mocks.NewMockWidget(t)
313274
314- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
275+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
315276
316277 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
317278
@@ -329,9 +290,8 @@ func TestHasFocus_NilWebView_ReturnsFalse(t *testing.T) {
329290 mockFactory := mocks.NewMockWidgetFactory(t)
330291 mockOverlay := mocks.NewMockOverlayWidget(t)
331292 mockBorderBox := mocks.NewMockBoxWidget(t)
332- mockProgressBar := mocks.NewMockProgressBarWidget(t)
333293
334- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)
294+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
335295
336296 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
337297
@@ -347,10 +307,9 @@ func TestWidget_ReturnsOverlay(t *testing.T) {
347307 mockFactory := mocks.NewMockWidgetFactory(t)
348308 mockOverlay := mocks.NewMockOverlayWidget(t)
349309 mockBorderBox := mocks.NewMockBoxWidget(t)
350- mockProgressBar := mocks.NewMockProgressBarWidget(t)
351310 mockWebView := mocks.NewMockWidget(t)
352311
353- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
312+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
354313
355314 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
356315
@@ -366,10 +325,9 @@ func TestOverlay_ReturnsOverlayWidget(t *testing.T) {
366325 mockFactory := mocks.NewMockWidgetFactory(t)
367326 mockOverlay := mocks.NewMockOverlayWidget(t)
368327 mockBorderBox := mocks.NewMockBoxWidget(t)
369- mockProgressBar := mocks.NewMockProgressBarWidget(t)
370328 mockWebView := mocks.NewMockWidget(t)
371329
372- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
330+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
373331
374332 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
375333
@@ -385,10 +343,9 @@ func TestShow_DelegatesToOverlay(t *testing.T) {
385343 mockFactory := mocks.NewMockWidgetFactory(t)
386344 mockOverlay := mocks.NewMockOverlayWidget(t)
387345 mockBorderBox := mocks.NewMockBoxWidget(t)
388- mockProgressBar := mocks.NewMockProgressBarWidget(t)
389346 mockWebView := mocks.NewMockWidget(t)
390347
391- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
348+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
392349
393350 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
394351
@@ -405,10 +362,9 @@ func TestHide_DelegatesToOverlay(t *testing.T) {
405362 mockFactory := mocks.NewMockWidgetFactory(t)
406363 mockOverlay := mocks.NewMockOverlayWidget(t)
407364 mockBorderBox := mocks.NewMockBoxWidget(t)
408- mockProgressBar := mocks.NewMockProgressBarWidget(t)
409365 mockWebView := mocks.NewMockWidget(t)
410366
411- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
367+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
412368
413369 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
414370
@@ -425,10 +381,9 @@ func TestSetVisible_DelegatesToOverlay(t *testing.T) {
425381 mockFactory := mocks.NewMockWidgetFactory(t)
426382 mockOverlay := mocks.NewMockOverlayWidget(t)
427383 mockBorderBox := mocks.NewMockBoxWidget(t)
428- mockProgressBar := mocks.NewMockProgressBarWidget(t)
429384 mockWebView := mocks.NewMockWidget(t)
430385
431- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
386+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
432387
433388 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
434389
@@ -445,10 +400,9 @@ func TestIsVisible_DelegatesToOverlay(t *testing.T) {
445400 mockFactory := mocks.NewMockWidgetFactory(t)
446401 mockOverlay := mocks.NewMockOverlayWidget(t)
447402 mockBorderBox := mocks.NewMockBoxWidget(t)
448- mockProgressBar := mocks.NewMockProgressBarWidget(t)
449403 mockWebView := mocks.NewMockWidget(t)
450404
451- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
405+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
452406
453407 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
454408
@@ -466,10 +420,9 @@ func TestAddCssClass_DelegatesToOverlay(t *testing.T) {
466420 mockFactory := mocks.NewMockWidgetFactory(t)
467421 mockOverlay := mocks.NewMockOverlayWidget(t)
468422 mockBorderBox := mocks.NewMockBoxWidget(t)
469- mockProgressBar := mocks.NewMockProgressBarWidget(t)
470423 mockWebView := mocks.NewMockWidget(t)
471424
472- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
425+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
473426
474427 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
475428
@@ -486,10 +439,9 @@ func TestRemoveCssClass_DelegatesToOverlay(t *testing.T) {
486439 mockFactory := mocks.NewMockWidgetFactory(t)
487440 mockOverlay := mocks.NewMockOverlayWidget(t)
488441 mockBorderBox := mocks.NewMockBoxWidget(t)
489- mockProgressBar := mocks.NewMockProgressBarWidget(t)
490442 mockWebView := mocks.NewMockWidget(t)
491443
492- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
444+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
493445
494446 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
495447
@@ -506,10 +458,9 @@ func TestSetOnFocusIn_SetsCallback(t *testing.T) {
506458 mockFactory := mocks.NewMockWidgetFactory(t)
507459 mockOverlay := mocks.NewMockOverlayWidget(t)
508460 mockBorderBox := mocks.NewMockBoxWidget(t)
509- mockProgressBar := mocks.NewMockProgressBarWidget(t)
510461 mockWebView := mocks.NewMockWidget(t)
511462
512- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
463+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
513464
514465 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
515466
@@ -527,10 +478,9 @@ func TestSetOnFocusOut_SetsCallback(t *testing.T) {
527478 mockFactory := mocks.NewMockWidgetFactory(t)
528479 mockOverlay := mocks.NewMockOverlayWidget(t)
529480 mockBorderBox := mocks.NewMockBoxWidget(t)
530- mockProgressBar := mocks.NewMockProgressBarWidget(t)
531481 mockWebView := mocks.NewMockWidget(t)
532482
533- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)
483+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
534484
535485 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
536486
@@ -548,7 +498,6 @@ func setupPaneViewMocks(
548498 mockFactory *mocks.MockWidgetFactory,
549499 mockOverlay *mocks.MockOverlayWidget,
550500 mockBorderBox *mocks.MockBoxWidget,
551- mockProgressBar *mocks.MockProgressBarWidget,
552501 mockWebView *mocks.MockWidget,
553502 ) {
554503 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
@@ -567,26 +516,12 @@ func setupPaneViewMocks(
567516 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()
568517 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
569518 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
570-
571- // Progress bar setup
572- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
573- mockProgressBar.EXPECT().AddCssClass("osd").Once()
574- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
575- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
576- mockProgressBar.EXPECT().SetHexpand(true).Once()
577- mockProgressBar.EXPECT().SetCanTarget(false).Once()
578- mockProgressBar.EXPECT().SetCanFocus(false).Once()
579- mockProgressBar.EXPECT().SetVisible(false).Once()
580- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
581- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
582- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
583519 }
584520
585521 func setupPaneViewMocksNoWebView(
586522 mockFactory *mocks.MockWidgetFactory,
587523 mockOverlay *mocks.MockOverlayWidget,
588524 mockBorderBox *mocks.MockBoxWidget,
589- mockProgressBar *mocks.MockProgressBarWidget,
590525 ) {
591526 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
592527 mockOverlay.EXPECT().SetHexpand(true).Once()
@@ -602,17 +537,4 @@ func setupPaneViewMocksNoWebView(
602537 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()
603538 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
604539 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
605-
606- // Progress bar setup
607- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
608- mockProgressBar.EXPECT().AddCssClass("osd").Once()
609- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
610- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
611- mockProgressBar.EXPECT().SetHexpand(true).Once()
612- mockProgressBar.EXPECT().SetCanTarget(false).Once()
613- mockProgressBar.EXPECT().SetCanFocus(false).Once()
614- mockProgressBar.EXPECT().SetVisible(false).Once()
615- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
616- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
617- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
618540 }
@@ -3,7 +3,6 @@ package component_test
3 import (3 import (
4 "testing"4 "testing"
5 5
6- "github.com/jwijenbergh/puregotk/v4/gtk"
7 "github.com/stretchr/testify/assert"6 "github.com/stretchr/testify/assert"
8 "github.com/stretchr/testify/require"7 "github.com/stretchr/testify/require"
9 8
@@ -18,7 +17,6 @@ func TestNewPaneView_CreatesOverlay(t *testing.T) {
18 mockFactory := mocks.NewMockWidgetFactory(t)17 mockFactory := mocks.NewMockWidgetFactory(t)
19 mockOverlay := mocks.NewMockOverlayWidget(t)18 mockOverlay := mocks.NewMockOverlayWidget(t)
20 mockBorderBox := mocks.NewMockBoxWidget(t)19 mockBorderBox := mocks.NewMockBoxWidget(t)
21- mockProgressBar := mocks.NewMockProgressBarWidget(t)
22 mockWebView := mocks.NewMockWidget(t)20 mockWebView := mocks.NewMockWidget(t)
23 21
24 paneID := entity.PaneID("pane-1")22 paneID := entity.PaneID("pane-1")
@@ -40,19 +38,6 @@ func TestNewPaneView_CreatesOverlay(t *testing.T) {
40 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()38 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
41 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()39 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
42 40
43- // Progress bar setup
44- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
45- mockProgressBar.EXPECT().AddCssClass("osd").Once()
46- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
47- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
48- mockProgressBar.EXPECT().SetHexpand(true).Once()
49- mockProgressBar.EXPECT().SetCanTarget(false).Once()
50- mockProgressBar.EXPECT().SetCanFocus(false).Once()
51- mockProgressBar.EXPECT().SetVisible(false).Once()
52- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
53- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
54- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
55-
56 // Act41 // Act
57 pv := component.NewPaneView(mockFactory, paneID, mockWebView)42 pv := component.NewPaneView(mockFactory, paneID, mockWebView)
58 43
@@ -67,7 +52,6 @@ func TestNewPaneView_NilWebView(t *testing.T) {
67 mockFactory := mocks.NewMockWidgetFactory(t)52 mockFactory := mocks.NewMockWidgetFactory(t)
68 mockOverlay := mocks.NewMockOverlayWidget(t)53 mockOverlay := mocks.NewMockOverlayWidget(t)
69 mockBorderBox := mocks.NewMockBoxWidget(t)54 mockBorderBox := mocks.NewMockBoxWidget(t)
70- mockProgressBar := mocks.NewMockProgressBarWidget(t)
71 55
72 paneID := entity.PaneID("pane-1")56 paneID := entity.PaneID("pane-1")
73 57
@@ -87,19 +71,6 @@ func TestNewPaneView_NilWebView(t *testing.T) {
87 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()71 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
88 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()72 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
89 73
90- // Progress bar setup
91- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
92- mockProgressBar.EXPECT().AddCssClass("osd").Once()
93- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
94- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
95- mockProgressBar.EXPECT().SetHexpand(true).Once()
96- mockProgressBar.EXPECT().SetCanTarget(false).Once()
97- mockProgressBar.EXPECT().SetCanFocus(false).Once()
98- mockProgressBar.EXPECT().SetVisible(false).Once()
99- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
100- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
101- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
102-
103 // Act74 // Act
104 pv := component.NewPaneView(mockFactory, paneID, nil)75 pv := component.NewPaneView(mockFactory, paneID, nil)
105 76
@@ -113,10 +84,9 @@ func TestSetActive_True_AddsCSSClass(t *testing.T) {
113 mockFactory := mocks.NewMockWidgetFactory(t)84 mockFactory := mocks.NewMockWidgetFactory(t)
114 mockOverlay := mocks.NewMockOverlayWidget(t)85 mockOverlay := mocks.NewMockOverlayWidget(t)
115 mockBorderBox := mocks.NewMockBoxWidget(t)86 mockBorderBox := mocks.NewMockBoxWidget(t)
116- mockProgressBar := mocks.NewMockProgressBarWidget(t)
117 mockWebView := mocks.NewMockWidget(t)87 mockWebView := mocks.NewMockWidget(t)
118 88
119- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)89+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
120 90
121 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)91 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
122 92
@@ -135,10 +105,9 @@ func TestSetActive_False_RemovesCSSClass(t *testing.T) {
135 mockFactory := mocks.NewMockWidgetFactory(t)105 mockFactory := mocks.NewMockWidgetFactory(t)
136 mockOverlay := mocks.NewMockOverlayWidget(t)106 mockOverlay := mocks.NewMockOverlayWidget(t)
137 mockBorderBox := mocks.NewMockBoxWidget(t)107 mockBorderBox := mocks.NewMockBoxWidget(t)
138- mockProgressBar := mocks.NewMockProgressBarWidget(t)
139 mockWebView := mocks.NewMockWidget(t)108 mockWebView := mocks.NewMockWidget(t)
140 109
141- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)110+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
142 111
143 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)112 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
144 113
@@ -161,10 +130,9 @@ func TestSetActive_NoChangeWhenSameState(t *testing.T) {
161 mockFactory := mocks.NewMockWidgetFactory(t)130 mockFactory := mocks.NewMockWidgetFactory(t)
162 mockOverlay := mocks.NewMockOverlayWidget(t)131 mockOverlay := mocks.NewMockOverlayWidget(t)
163 mockBorderBox := mocks.NewMockBoxWidget(t)132 mockBorderBox := mocks.NewMockBoxWidget(t)
164- mockProgressBar := mocks.NewMockProgressBarWidget(t)
165 mockWebView := mocks.NewMockWidget(t)133 mockWebView := mocks.NewMockWidget(t)
166 134
167- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)135+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
168 136
169 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)137 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
170 138
@@ -180,11 +148,10 @@ func TestPaneID_ReturnsPaneID(t *testing.T) {
180 mockFactory := mocks.NewMockWidgetFactory(t)148 mockFactory := mocks.NewMockWidgetFactory(t)
181 mockOverlay := mocks.NewMockOverlayWidget(t)149 mockOverlay := mocks.NewMockOverlayWidget(t)
182 mockBorderBox := mocks.NewMockBoxWidget(t)150 mockBorderBox := mocks.NewMockBoxWidget(t)
183- mockProgressBar := mocks.NewMockProgressBarWidget(t)
184 mockWebView := mocks.NewMockWidget(t)151 mockWebView := mocks.NewMockWidget(t)
185 152
186 paneID := entity.PaneID("test-pane-123")153 paneID := entity.PaneID("test-pane-123")
187- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)154+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
188 155
189 pv := component.NewPaneView(mockFactory, paneID, mockWebView)156 pv := component.NewPaneView(mockFactory, paneID, mockWebView)
190 157
@@ -200,10 +167,9 @@ func TestWebViewWidget_ReturnsWebView(t *testing.T) {
200 mockFactory := mocks.NewMockWidgetFactory(t)167 mockFactory := mocks.NewMockWidgetFactory(t)
201 mockOverlay := mocks.NewMockOverlayWidget(t)168 mockOverlay := mocks.NewMockOverlayWidget(t)
202 mockBorderBox := mocks.NewMockBoxWidget(t)169 mockBorderBox := mocks.NewMockBoxWidget(t)
203- mockProgressBar := mocks.NewMockProgressBarWidget(t)
204 mockWebView := mocks.NewMockWidget(t)170 mockWebView := mocks.NewMockWidget(t)
205 171
206- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)172+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
207 173
208 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)174 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
209 175
@@ -219,11 +185,10 @@ func TestSetWebViewWidget_ReplacesWidget(t *testing.T) {
219 mockFactory := mocks.NewMockWidgetFactory(t)185 mockFactory := mocks.NewMockWidgetFactory(t)
220 mockOverlay := mocks.NewMockOverlayWidget(t)186 mockOverlay := mocks.NewMockOverlayWidget(t)
221 mockBorderBox := mocks.NewMockBoxWidget(t)187 mockBorderBox := mocks.NewMockBoxWidget(t)
222- mockProgressBar := mocks.NewMockProgressBarWidget(t)
223 mockOldWebView := mocks.NewMockWidget(t)188 mockOldWebView := mocks.NewMockWidget(t)
224 mockNewWebView := mocks.NewMockWidget(t)189 mockNewWebView := mocks.NewMockWidget(t)
225 190
226- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockOldWebView)191+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockOldWebView)
227 192
228 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockOldWebView)193 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockOldWebView)
229 194
@@ -245,10 +210,9 @@ func TestSetWebViewWidget_FromNil(t *testing.T) {
245 mockFactory := mocks.NewMockWidgetFactory(t)210 mockFactory := mocks.NewMockWidgetFactory(t)
246 mockOverlay := mocks.NewMockOverlayWidget(t)211 mockOverlay := mocks.NewMockOverlayWidget(t)
247 mockBorderBox := mocks.NewMockBoxWidget(t)212 mockBorderBox := mocks.NewMockBoxWidget(t)
248- mockProgressBar := mocks.NewMockProgressBarWidget(t)
249 mockNewWebView := mocks.NewMockWidget(t)213 mockNewWebView := mocks.NewMockWidget(t)
250 214
251- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)215+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
252 216
253 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)217 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
254 218
@@ -269,10 +233,9 @@ func TestGrabFocus_DelegatesToWebView(t *testing.T) {
269 mockFactory := mocks.NewMockWidgetFactory(t)233 mockFactory := mocks.NewMockWidgetFactory(t)
270 mockOverlay := mocks.NewMockOverlayWidget(t)234 mockOverlay := mocks.NewMockOverlayWidget(t)
271 mockBorderBox := mocks.NewMockBoxWidget(t)235 mockBorderBox := mocks.NewMockBoxWidget(t)
272- mockProgressBar := mocks.NewMockProgressBarWidget(t)
273 mockWebView := mocks.NewMockWidget(t)236 mockWebView := mocks.NewMockWidget(t)
274 237
275- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)238+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
276 239
277 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)240 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
278 241
@@ -290,9 +253,8 @@ func TestGrabFocus_NilWebView_ReturnsFalse(t *testing.T) {
290 mockFactory := mocks.NewMockWidgetFactory(t)253 mockFactory := mocks.NewMockWidgetFactory(t)
291 mockOverlay := mocks.NewMockOverlayWidget(t)254 mockOverlay := mocks.NewMockOverlayWidget(t)
292 mockBorderBox := mocks.NewMockBoxWidget(t)255 mockBorderBox := mocks.NewMockBoxWidget(t)
293- mockProgressBar := mocks.NewMockProgressBarWidget(t)
294 256
295- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)257+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
296 258
297 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)259 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
298 260
@@ -308,10 +270,9 @@ func TestHasFocus_DelegatesToWebView(t *testing.T) {
308 mockFactory := mocks.NewMockWidgetFactory(t)270 mockFactory := mocks.NewMockWidgetFactory(t)
309 mockOverlay := mocks.NewMockOverlayWidget(t)271 mockOverlay := mocks.NewMockOverlayWidget(t)
310 mockBorderBox := mocks.NewMockBoxWidget(t)272 mockBorderBox := mocks.NewMockBoxWidget(t)
311- mockProgressBar := mocks.NewMockProgressBarWidget(t)
312 mockWebView := mocks.NewMockWidget(t)273 mockWebView := mocks.NewMockWidget(t)
313 274
314- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)275+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
315 276
316 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)277 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
317 278
@@ -329,9 +290,8 @@ func TestHasFocus_NilWebView_ReturnsFalse(t *testing.T) {
329 mockFactory := mocks.NewMockWidgetFactory(t)290 mockFactory := mocks.NewMockWidgetFactory(t)
330 mockOverlay := mocks.NewMockOverlayWidget(t)291 mockOverlay := mocks.NewMockOverlayWidget(t)
331 mockBorderBox := mocks.NewMockBoxWidget(t)292 mockBorderBox := mocks.NewMockBoxWidget(t)
332- mockProgressBar := mocks.NewMockProgressBarWidget(t)
333 293
334- setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox, mockProgressBar)294+ setupPaneViewMocksNoWebView(mockFactory, mockOverlay, mockBorderBox)
335 295
336 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)296 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), nil)
337 297
@@ -347,10 +307,9 @@ func TestWidget_ReturnsOverlay(t *testing.T) {
347 mockFactory := mocks.NewMockWidgetFactory(t)307 mockFactory := mocks.NewMockWidgetFactory(t)
348 mockOverlay := mocks.NewMockOverlayWidget(t)308 mockOverlay := mocks.NewMockOverlayWidget(t)
349 mockBorderBox := mocks.NewMockBoxWidget(t)309 mockBorderBox := mocks.NewMockBoxWidget(t)
350- mockProgressBar := mocks.NewMockProgressBarWidget(t)
351 mockWebView := mocks.NewMockWidget(t)310 mockWebView := mocks.NewMockWidget(t)
352 311
353- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)312+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
354 313
355 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)314 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
356 315
@@ -366,10 +325,9 @@ func TestOverlay_ReturnsOverlayWidget(t *testing.T) {
366 mockFactory := mocks.NewMockWidgetFactory(t)325 mockFactory := mocks.NewMockWidgetFactory(t)
367 mockOverlay := mocks.NewMockOverlayWidget(t)326 mockOverlay := mocks.NewMockOverlayWidget(t)
368 mockBorderBox := mocks.NewMockBoxWidget(t)327 mockBorderBox := mocks.NewMockBoxWidget(t)
369- mockProgressBar := mocks.NewMockProgressBarWidget(t)
370 mockWebView := mocks.NewMockWidget(t)328 mockWebView := mocks.NewMockWidget(t)
371 329
372- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)330+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
373 331
374 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)332 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
375 333
@@ -385,10 +343,9 @@ func TestShow_DelegatesToOverlay(t *testing.T) {
385 mockFactory := mocks.NewMockWidgetFactory(t)343 mockFactory := mocks.NewMockWidgetFactory(t)
386 mockOverlay := mocks.NewMockOverlayWidget(t)344 mockOverlay := mocks.NewMockOverlayWidget(t)
387 mockBorderBox := mocks.NewMockBoxWidget(t)345 mockBorderBox := mocks.NewMockBoxWidget(t)
388- mockProgressBar := mocks.NewMockProgressBarWidget(t)
389 mockWebView := mocks.NewMockWidget(t)346 mockWebView := mocks.NewMockWidget(t)
390 347
391- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)348+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
392 349
393 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)350 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
394 351
@@ -405,10 +362,9 @@ func TestHide_DelegatesToOverlay(t *testing.T) {
405 mockFactory := mocks.NewMockWidgetFactory(t)362 mockFactory := mocks.NewMockWidgetFactory(t)
406 mockOverlay := mocks.NewMockOverlayWidget(t)363 mockOverlay := mocks.NewMockOverlayWidget(t)
407 mockBorderBox := mocks.NewMockBoxWidget(t)364 mockBorderBox := mocks.NewMockBoxWidget(t)
408- mockProgressBar := mocks.NewMockProgressBarWidget(t)
409 mockWebView := mocks.NewMockWidget(t)365 mockWebView := mocks.NewMockWidget(t)
410 366
411- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)367+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
412 368
413 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)369 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
414 370
@@ -425,10 +381,9 @@ func TestSetVisible_DelegatesToOverlay(t *testing.T) {
425 mockFactory := mocks.NewMockWidgetFactory(t)381 mockFactory := mocks.NewMockWidgetFactory(t)
426 mockOverlay := mocks.NewMockOverlayWidget(t)382 mockOverlay := mocks.NewMockOverlayWidget(t)
427 mockBorderBox := mocks.NewMockBoxWidget(t)383 mockBorderBox := mocks.NewMockBoxWidget(t)
428- mockProgressBar := mocks.NewMockProgressBarWidget(t)
429 mockWebView := mocks.NewMockWidget(t)384 mockWebView := mocks.NewMockWidget(t)
430 385
431- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)386+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
432 387
433 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)388 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
434 389
@@ -445,10 +400,9 @@ func TestIsVisible_DelegatesToOverlay(t *testing.T) {
445 mockFactory := mocks.NewMockWidgetFactory(t)400 mockFactory := mocks.NewMockWidgetFactory(t)
446 mockOverlay := mocks.NewMockOverlayWidget(t)401 mockOverlay := mocks.NewMockOverlayWidget(t)
447 mockBorderBox := mocks.NewMockBoxWidget(t)402 mockBorderBox := mocks.NewMockBoxWidget(t)
448- mockProgressBar := mocks.NewMockProgressBarWidget(t)
449 mockWebView := mocks.NewMockWidget(t)403 mockWebView := mocks.NewMockWidget(t)
450 404
451- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)405+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
452 406
453 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)407 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
454 408
@@ -466,10 +420,9 @@ func TestAddCssClass_DelegatesToOverlay(t *testing.T) {
466 mockFactory := mocks.NewMockWidgetFactory(t)420 mockFactory := mocks.NewMockWidgetFactory(t)
467 mockOverlay := mocks.NewMockOverlayWidget(t)421 mockOverlay := mocks.NewMockOverlayWidget(t)
468 mockBorderBox := mocks.NewMockBoxWidget(t)422 mockBorderBox := mocks.NewMockBoxWidget(t)
469- mockProgressBar := mocks.NewMockProgressBarWidget(t)
470 mockWebView := mocks.NewMockWidget(t)423 mockWebView := mocks.NewMockWidget(t)
471 424
472- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)425+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
473 426
474 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)427 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
475 428
@@ -486,10 +439,9 @@ func TestRemoveCssClass_DelegatesToOverlay(t *testing.T) {
486 mockFactory := mocks.NewMockWidgetFactory(t)439 mockFactory := mocks.NewMockWidgetFactory(t)
487 mockOverlay := mocks.NewMockOverlayWidget(t)440 mockOverlay := mocks.NewMockOverlayWidget(t)
488 mockBorderBox := mocks.NewMockBoxWidget(t)441 mockBorderBox := mocks.NewMockBoxWidget(t)
489- mockProgressBar := mocks.NewMockProgressBarWidget(t)
490 mockWebView := mocks.NewMockWidget(t)442 mockWebView := mocks.NewMockWidget(t)
491 443
492- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)444+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
493 445
494 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)446 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
495 447
@@ -506,10 +458,9 @@ func TestSetOnFocusIn_SetsCallback(t *testing.T) {
506 mockFactory := mocks.NewMockWidgetFactory(t)458 mockFactory := mocks.NewMockWidgetFactory(t)
507 mockOverlay := mocks.NewMockOverlayWidget(t)459 mockOverlay := mocks.NewMockOverlayWidget(t)
508 mockBorderBox := mocks.NewMockBoxWidget(t)460 mockBorderBox := mocks.NewMockBoxWidget(t)
509- mockProgressBar := mocks.NewMockProgressBarWidget(t)
510 mockWebView := mocks.NewMockWidget(t)461 mockWebView := mocks.NewMockWidget(t)
511 462
512- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)463+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
513 464
514 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)465 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
515 466
@@ -527,10 +478,9 @@ func TestSetOnFocusOut_SetsCallback(t *testing.T) {
527 mockFactory := mocks.NewMockWidgetFactory(t)478 mockFactory := mocks.NewMockWidgetFactory(t)
528 mockOverlay := mocks.NewMockOverlayWidget(t)479 mockOverlay := mocks.NewMockOverlayWidget(t)
529 mockBorderBox := mocks.NewMockBoxWidget(t)480 mockBorderBox := mocks.NewMockBoxWidget(t)
530- mockProgressBar := mocks.NewMockProgressBarWidget(t)
531 mockWebView := mocks.NewMockWidget(t)481 mockWebView := mocks.NewMockWidget(t)
532 482
533- setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockProgressBar, mockWebView)483+ setupPaneViewMocks(mockFactory, mockOverlay, mockBorderBox, mockWebView)
534 484
535 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)485 pv := component.NewPaneView(mockFactory, entity.PaneID("pane-1"), mockWebView)
536 486
@@ -548,7 +498,6 @@ func setupPaneViewMocks(
548 mockFactory *mocks.MockWidgetFactory,498 mockFactory *mocks.MockWidgetFactory,
549 mockOverlay *mocks.MockOverlayWidget,499 mockOverlay *mocks.MockOverlayWidget,
550 mockBorderBox *mocks.MockBoxWidget,500 mockBorderBox *mocks.MockBoxWidget,
551- mockProgressBar *mocks.MockProgressBarWidget,
552 mockWebView *mocks.MockWidget,501 mockWebView *mocks.MockWidget,
553 ) {502 ) {
554 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()503 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
@@ -567,26 +516,12 @@ func setupPaneViewMocks(
567 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()516 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()
568 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()517 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
569 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()518 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
570-
571- // Progress bar setup
572- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
573- mockProgressBar.EXPECT().AddCssClass("osd").Once()
574- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
575- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
576- mockProgressBar.EXPECT().SetHexpand(true).Once()
577- mockProgressBar.EXPECT().SetCanTarget(false).Once()
578- mockProgressBar.EXPECT().SetCanFocus(false).Once()
579- mockProgressBar.EXPECT().SetVisible(false).Once()
580- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
581- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
582- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
583 }519 }
584 520
585 func setupPaneViewMocksNoWebView(521 func setupPaneViewMocksNoWebView(
586 mockFactory *mocks.MockWidgetFactory,522 mockFactory *mocks.MockWidgetFactory,
587 mockOverlay *mocks.MockOverlayWidget,523 mockOverlay *mocks.MockOverlayWidget,
588 mockBorderBox *mocks.MockBoxWidget,524 mockBorderBox *mocks.MockBoxWidget,
589- mockProgressBar *mocks.MockProgressBarWidget,
590 ) {525 ) {
591 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()526 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
592 mockOverlay.EXPECT().SetHexpand(true).Once()527 mockOverlay.EXPECT().SetHexpand(true).Once()
@@ -602,17 +537,4 @@ func setupPaneViewMocksNoWebView(
602 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()537 mockOverlay.EXPECT().AddOverlay(mockBorderBox).Once()
603 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()538 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
604 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()539 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
605-
606- // Progress bar setup
607- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
608- mockProgressBar.EXPECT().AddCssClass("osd").Once()
609- mockProgressBar.EXPECT().SetValign(gtk.AlignEndValue).Once()
610- mockProgressBar.EXPECT().SetHalign(gtk.AlignFillValue).Once()
611- mockProgressBar.EXPECT().SetHexpand(true).Once()
612- mockProgressBar.EXPECT().SetCanTarget(false).Once()
613- mockProgressBar.EXPECT().SetCanFocus(false).Once()
614- mockProgressBar.EXPECT().SetVisible(false).Once()
615- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
616- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
617- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
618 }540 }
M internal/ui/component/workspace_view_test.go +0 -14
@@ -36,7 +36,6 @@ func setupWorkspaceViewBase(t *testing.T, mockFactory *mocks.MockWidgetFactory)
3636 func setupWorkspacePaneViewMocks(t *testing.T, mockFactory *mocks.MockWidgetFactory) (*mocks.MockOverlayWidget, *mocks.MockBoxWidget) {
3737 mockOverlay := mocks.NewMockOverlayWidget(t)
3838 mockBorderBox := mocks.NewMockBoxWidget(t)
39- mockProgressBar := mocks.NewMockProgressBarWidget(t)
4039
4140 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
4241 mockOverlay.EXPECT().SetHexpand(true).Once()
@@ -53,19 +52,6 @@ func setupWorkspacePaneViewMocks(t *testing.T, mockFactory *mocks.MockWidgetFact
5352 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
5453 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
5554
56- // Progress bar setup
57- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
58- mockProgressBar.EXPECT().AddCssClass("osd").Once()
59- mockProgressBar.EXPECT().SetValign(mock.Anything).Once()
60- mockProgressBar.EXPECT().SetHalign(mock.Anything).Once()
61- mockProgressBar.EXPECT().SetHexpand(true).Once()
62- mockProgressBar.EXPECT().SetCanTarget(false).Once()
63- mockProgressBar.EXPECT().SetCanFocus(false).Once()
64- mockProgressBar.EXPECT().SetVisible(false).Once()
65- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
66- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
67- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
68-
6955 // GtkWidget is called when attaching hover handler - return nil for tests
7056 mockOverlay.EXPECT().GtkWidget().Return(nil).Once()
7157
@@ -36,7 +36,6 @@ func setupWorkspaceViewBase(t *testing.T, mockFactory *mocks.MockWidgetFactory)
36 func setupWorkspacePaneViewMocks(t *testing.T, mockFactory *mocks.MockWidgetFactory) (*mocks.MockOverlayWidget, *mocks.MockBoxWidget) {36 func setupWorkspacePaneViewMocks(t *testing.T, mockFactory *mocks.MockWidgetFactory) (*mocks.MockOverlayWidget, *mocks.MockBoxWidget) {
37 mockOverlay := mocks.NewMockOverlayWidget(t)37 mockOverlay := mocks.NewMockOverlayWidget(t)
38 mockBorderBox := mocks.NewMockBoxWidget(t)38 mockBorderBox := mocks.NewMockBoxWidget(t)
39- mockProgressBar := mocks.NewMockProgressBarWidget(t)
40 39
41 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()40 mockFactory.EXPECT().NewOverlay().Return(mockOverlay).Once()
42 mockOverlay.EXPECT().SetHexpand(true).Once()41 mockOverlay.EXPECT().SetHexpand(true).Once()
@@ -53,19 +52,6 @@ func setupWorkspacePaneViewMocks(t *testing.T, mockFactory *mocks.MockWidgetFact
53 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()52 mockOverlay.EXPECT().SetClipOverlay(mockBorderBox, false).Once()
54 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()53 mockOverlay.EXPECT().SetMeasureOverlay(mockBorderBox, false).Once()
55 54
56- // Progress bar setup
57- mockFactory.EXPECT().NewProgressBar().Return(mockProgressBar).Once()
58- mockProgressBar.EXPECT().AddCssClass("osd").Once()
59- mockProgressBar.EXPECT().SetValign(mock.Anything).Once()
60- mockProgressBar.EXPECT().SetHalign(mock.Anything).Once()
61- mockProgressBar.EXPECT().SetHexpand(true).Once()
62- mockProgressBar.EXPECT().SetCanTarget(false).Once()
63- mockProgressBar.EXPECT().SetCanFocus(false).Once()
64- mockProgressBar.EXPECT().SetVisible(false).Once()
65- mockOverlay.EXPECT().AddOverlay(mockProgressBar).Once()
66- mockOverlay.EXPECT().SetClipOverlay(mockProgressBar, false).Once()
67- mockOverlay.EXPECT().SetMeasureOverlay(mockProgressBar, false).Once()
68-
69 // GtkWidget is called when attaching hover handler - return nil for tests55 // GtkWidget is called when attaching hover handler - return nil for tests
70 mockOverlay.EXPECT().GtkWidget().Return(nil).Once()56 mockOverlay.EXPECT().GtkWidget().Return(nil).Once()
71 57
M internal/ui/layout/split_test.go +15 -3
@@ -131,7 +131,11 @@ func TestSetRatio_ValidRange(t *testing.T) {
131131 sv.SetRatio(tt.input)
132132
133133 // Assert
134- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
134+ if tt.expected == 0.0 {
135+ assert.Equal(t, tt.expected, sv.GetRatio())
136+ } else {
137+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
138+ }
135139 })
136140 }
137141 }
@@ -164,7 +168,11 @@ func TestSetRatio_OutOfRange_Clamped(t *testing.T) {
164168 sv.SetRatio(tt.input)
165169
166170 // Assert
167- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
171+ if tt.expected == 0.0 {
172+ assert.Equal(t, tt.expected, sv.GetRatio())
173+ } else {
174+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
175+ }
168176 })
169177 }
170178 }
@@ -368,7 +376,11 @@ func TestNewSplitView_InitialRatio_Clamped(t *testing.T) {
368376 sv := layout.NewSplitView(ctx, mockFactory, layout.OrientationHorizontal, nil, nil, tt.input)
369377
370378 // Assert
371- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
379+ if tt.expected == 0.0 {
380+ assert.Equal(t, tt.expected, sv.GetRatio())
381+ } else {
382+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
383+ }
372384 })
373385 }
374386 }
@@ -131,7 +131,11 @@ func TestSetRatio_ValidRange(t *testing.T) {
131 sv.SetRatio(tt.input)131 sv.SetRatio(tt.input)
132 132
133 // Assert133 // Assert
134- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)134+ if tt.expected == 0.0 {
135+ assert.Equal(t, tt.expected, sv.GetRatio())
136+ } else {
137+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
138+ }
135 })139 })
136 }140 }
137 }141 }
@@ -164,7 +168,11 @@ func TestSetRatio_OutOfRange_Clamped(t *testing.T) {
164 sv.SetRatio(tt.input)168 sv.SetRatio(tt.input)
165 169
166 // Assert170 // Assert
167- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)171+ if tt.expected == 0.0 {
172+ assert.Equal(t, tt.expected, sv.GetRatio())
173+ } else {
174+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
175+ }
168 })176 })
169 }177 }
170 }178 }
@@ -368,7 +376,11 @@ func TestNewSplitView_InitialRatio_Clamped(t *testing.T) {
368 sv := layout.NewSplitView(ctx, mockFactory, layout.OrientationHorizontal, nil, nil, tt.input)376 sv := layout.NewSplitView(ctx, mockFactory, layout.OrientationHorizontal, nil, nil, tt.input)
369 377
370 // Assert378 // Assert
371- assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)379+ if tt.expected == 0.0 {
380+ assert.Equal(t, tt.expected, sv.GetRatio())
381+ } else {
382+ assert.InEpsilon(t, tt.expected, sv.GetRatio(), 0.0001)
383+ }
372 })384 })
373 }385 }
374 }386 }

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 8

Tags 42

↑↓ moveenter openesc close