Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit de293f2

Browse files
committed
Refactor set navigation timeout with duration
time.Duration should be used throughout the codebase instead of int64. This change ensures that in64 is quickly converted to a time.Duration which means we have to care less about whether the in64 is in seconds or milliseconds etc.
1 parent 37b7cf6 commit de293f2

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

common/browser_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func (b *BrowserContext) Route(url goja.Value, handler goja.Callable) {
265265
func (b *BrowserContext) SetDefaultNavigationTimeout(timeout int64) {
266266
b.logger.Debugf("BrowserContext:SetDefaultNavigationTimeout", "bctxid:%v timeout:%d", b.id, timeout)
267267

268-
b.timeoutSettings.setDefaultNavigationTimeout(timeout)
268+
b.timeoutSettings.setDefaultNavigationTimeout(time.Duration(timeout) * time.Millisecond)
269269
}
270270

271271
// SetDefaultTimeout sets the default maximum timeout in milliseconds.

common/page.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ func (p *Page) SetContent(html string, opts goja.Value) {
968968
func (p *Page) SetDefaultNavigationTimeout(timeout int64) {
969969
p.logger.Debugf("Page:SetDefaultNavigationTimeout", "sid:%v timeout:%d", p.sessionID(), timeout)
970970

971-
p.timeoutSettings.setDefaultNavigationTimeout(timeout)
971+
p.timeoutSettings.setDefaultNavigationTimeout(time.Duration(timeout) * time.Millisecond)
972972
}
973973

974974
// SetDefaultTimeout sets the default maximum timeout in milliseconds.

common/timeout.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ func (t *TimeoutSettings) setDefaultTimeout(timeout int64) {
2323
t.defaultTimeout = &timeout
2424
}
2525

26-
func (t *TimeoutSettings) setDefaultNavigationTimeout(timeout int64) {
27-
d := time.Duration(timeout) * time.Millisecond
28-
t.defaultNavigationTimeout = &d
26+
func (t *TimeoutSettings) setDefaultNavigationTimeout(timeout time.Duration) {
27+
t.defaultNavigationTimeout = &timeout
2928
}
3029

3130
func (t *TimeoutSettings) navigationTimeout() time.Duration {

common/timeout_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package common
22

33
import (
44
"testing"
5+
"time"
56

67
"github.com/stretchr/testify/assert"
78
)
@@ -70,7 +71,7 @@ func testTimeoutSettingsSetDefaultNavigationTimeout(t *testing.T) {
7071
t.Parallel()
7172

7273
ts := NewTimeoutSettings(nil)
73-
ts.setDefaultNavigationTimeout(100)
74+
ts.setDefaultNavigationTimeout(time.Duration(100) * time.Millisecond)
7475
assert.Equal(t, int64(100), ts.defaultNavigationTimeout.Milliseconds())
7576
}
7677

@@ -83,7 +84,7 @@ func testTimeoutSettingsNavigationTimeout(t *testing.T) {
8384
assert.Equal(t, DefaultTimeout, ts.navigationTimeout())
8485

8586
// Assert custom default timeout is used
86-
ts.setDefaultNavigationTimeout(100)
87+
ts.setDefaultNavigationTimeout(time.Duration(100) * time.Millisecond)
8788
assert.Equal(t, int64(100), ts.navigationTimeout().Milliseconds())
8889
}
8990

@@ -97,11 +98,11 @@ func testTimeoutSettingsNavigationTimeoutWithParent(t *testing.T) {
9798
assert.Equal(t, DefaultTimeout, tsWithParent.navigationTimeout())
9899

99100
// Assert custom default timeout from parent is used
100-
ts.setDefaultNavigationTimeout(1000)
101+
ts.setDefaultNavigationTimeout(time.Duration(1000) * time.Millisecond)
101102
assert.Equal(t, int64(1000), tsWithParent.navigationTimeout().Milliseconds())
102103

103104
// Assert custom default timeout is used (over parent)
104-
tsWithParent.setDefaultNavigationTimeout(100)
105+
tsWithParent.setDefaultNavigationTimeout(time.Duration(100) * time.Millisecond)
105106
assert.Equal(t, int64(100), tsWithParent.navigationTimeout().Milliseconds())
106107
}
107108

0 commit comments

Comments
 (0)