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

Commit 8c883dc

Browse files
committed
Fix the timeout conversion so it's consistent
The timeout is assumed to be in milliseconds when the user sets it using the provided APIs on browserContext and page. The issue is that internally it's assumed to be seconds. This commit fixes that for the default timeout so it's always assumed to be milliseconds.
1 parent 0da77ab commit 8c883dc

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

common/element_handle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (h *ElementHandle) dblClick(p *Position, opts *MouseClickOptions) error {
249249
}
250250

251251
func (h *ElementHandle) defaultTimeout() time.Duration {
252-
return time.Duration(h.frame.manager.timeoutSettings.timeout()) * time.Second
252+
return time.Duration(h.frame.manager.timeoutSettings.timeout()) * time.Millisecond
253253
}
254254

255255
func (h *ElementHandle) dispatchEvent(_ context.Context, typ string, eventInit goja.Value) (any, error) {

common/frame.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (f *Frame) detach() {
198198
}
199199

200200
func (f *Frame) defaultTimeout() time.Duration {
201-
return time.Duration(f.manager.timeoutSettings.timeout()) * time.Second
201+
return time.Duration(f.manager.timeoutSettings.timeout()) * time.Millisecond
202202
}
203203

204204
func (f *Frame) document() (*ElementHandle, error) {
@@ -1738,7 +1738,7 @@ func (f *Frame) WaitForNavigation(opts goja.Value) (api.Response, error) {
17381738
"fid:%s furl:%s", f.ID(), f.URL())
17391739

17401740
parsedOpts := NewFrameWaitForNavigationOptions(
1741-
time.Duration(f.manager.timeoutSettings.timeout()) * time.Second)
1741+
time.Duration(f.manager.timeoutSettings.timeout()) * time.Millisecond)
17421742
if err := parsedOpts.Parse(f.ctx, opts); err != nil {
17431743
k6ext.Panic(f.ctx, "parsing wait for navigation options: %w", err)
17441744
}

common/page.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (p *Page) closeWorker(sessionID target.SessionID) {
223223
}
224224

225225
func (p *Page) defaultTimeout() time.Duration {
226-
return time.Duration(p.timeoutSettings.timeout()) * time.Second
226+
return time.Duration(p.timeoutSettings.timeout()) * time.Millisecond
227227
}
228228

229229
func (p *Page) didClose() {

common/timeout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ func (t *TimeoutSettings) timeout() int64 {
4545
if t.parent != nil {
4646
return t.parent.timeout()
4747
}
48-
return int64(DefaultTimeout.Seconds())
48+
return int64(DefaultTimeout.Milliseconds())
4949
}

common/timeout_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func testTimeoutSettingsTimeout(t *testing.T) {
111111
ts := NewTimeoutSettings(nil)
112112

113113
// Assert default timeout value is used
114-
assert.Equal(t, int64(DefaultTimeout.Seconds()), ts.timeout())
114+
assert.Equal(t, int64(DefaultTimeout.Milliseconds()), ts.timeout())
115115

116116
// Assert custom default timeout is used
117117
ts.setDefaultTimeout(100)
@@ -125,7 +125,7 @@ func testTimeoutSettingsTimeoutWithParent(t *testing.T) {
125125
tsWithParent := NewTimeoutSettings(ts)
126126

127127
// Assert default timeout value is used
128-
assert.Equal(t, int64(DefaultTimeout.Seconds()), tsWithParent.timeout())
128+
assert.Equal(t, int64(DefaultTimeout.Milliseconds()), tsWithParent.timeout())
129129

130130
// Assert custom default timeout from parent is used
131131
ts.setDefaultTimeout(1000)

0 commit comments

Comments
 (0)