Fix reload & setContent to use navigation timeout

These methods should work with the default navigation instead of the default timeout to match the behaviour in Playwright.
grafana · Sep 18, 2023 · 499d0d0 · 499d0d0
1 parent 9cd064e
commit 499d0d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/common/frame.go b/common/frame.go
@@ -1428,7 +1428,9 @@ func (f *Frame) selectOption(selector string, values goja.Value, opts *FrameSele
 func (f *Frame) SetContent(html string, opts goja.Value) {
 	f.log.Debugf("Frame:SetContent", "fid:%s furl:%q", f.ID(), f.URL())
 
-	parsedOpts := NewFrameSetContentOptions(f.defaultTimeout())
+	parsedOpts := NewFrameSetContentOptions(
+		time.Duration(f.manager.timeoutSettings.navigationTimeout()) * time.Second,
+	)
 	if err := parsedOpts.Parse(f.ctx, opts); err != nil {
 		k6ext.Panic(f.ctx, "parsing set content options: %w", err)
 	}

diff --git a/common/page.go b/common/page.go
@@ -860,7 +860,10 @@ func (p *Page) QueryAll(selector string) ([]api.ElementHandle, error) {
 func (p *Page) Reload(opts goja.Value) api.Response {
 	p.logger.Debugf("Page:Reload", "sid:%v", p.sessionID())
 
-	parsedOpts := NewPageReloadOptions(LifecycleEventLoad, p.defaultTimeout())
+	parsedOpts := NewPageReloadOptions(
+		LifecycleEventLoad,
+		time.Duration(p.timeoutSettings.navigationTimeout())*time.Second,
+	)
 	if err := parsedOpts.Parse(p.ctx, opts); err != nil {
 		k6ext.Panic(p.ctx, "parsing reload options: %w", err)
 	}