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

Implement BrowserType.connect #800

Merged
merged 17 commits into from
Mar 2, 2023
Merged

Implement BrowserType.connect #800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2900f70
Remove storage.Dir property from BrowserType
ka3de Feb 22, 2023
5e9b761
Add BrowserProcessMeta abstraction
ka3de Feb 22, 2023
dd2c1fa
Modify BrowserProcess to use LocalBrowserProcessMeta
ka3de Feb 22, 2023
39e62b9
Avoid call to BrowserProcess meta from Browser
ka3de Feb 22, 2023
b0d75fd
Fix BrowserType.Connect method signature
ka3de Feb 22, 2023
383f254
Remove BrowserType logger
ka3de Feb 22, 2023
f87fd5f
Refactor browser options to use constants
ka3de Feb 22, 2023
aa84874
Add support for remote browser options
ka3de Feb 22, 2023
9aafb17
Rename NewBrowserProcess to NewLocalBrowserProcess
ka3de Feb 24, 2023
1815afd
Add constructor for NewRemoteBrowserProcess
ka3de Feb 24, 2023
8f42ed6
Refactor browser process constructors
ka3de Feb 24, 2023
a77bf3a
Implement BrowserType.Connect
ka3de Feb 27, 2023
c60ad61
Refactor, move ExecutablePath method
ka3de Feb 27, 2023
2b1a852
Refactor BrowserType Launch and Connect
ka3de Feb 27, 2023
eb32d01
Add BrowserType.Connect test
ka3de Feb 28, 2023
21253ab
Refactor cloud and remote browser flags
ka3de Mar 1, 2023
1bbf855
Avoid closing browser when executed remotely
ka3de Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add BrowserType.Connect test 
Also adds a new method in common.Browser API so we can get the
underlying browser process WS URL. This is required in order to reuse
the current TestBrowser implementation to launch a new browser and
connecto to it through BrowserType.Connect.
  • Loading branch information
@ka3de
ka3de committed Mar 2, 2023
commit eb32d01d233bd6fd1ee40b3d44bfcbb492304de8
5 changes: 5 additions & 0 deletions common/browser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,3 +526,8 @@ func (b *Browser) Version() string {
}
return product[i+1:]
}

// WsURL returns the Websocket URL that the browser is listening on for CDP clients.
func (b *Browser) WsURL() string {
return b.browserProc.WsURL()
}
20 changes: 20 additions & 0 deletions tests/browser_type_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package tests

import (
"testing"

"github.com/grafana/xk6-browser/chromium"
"github.com/grafana/xk6-browser/k6ext/k6test"
)

func TestBrowserTypeConnect(t *testing.T) {
// Start a test browser so we can get its WS URL
// and use it to connect through BrowserType.Connect.
tb := newTestBrowser(t)
vu := k6test.NewVU(t)
bt := chromium.NewBrowserType(vu)
vu.MoveToVUContext()

b := bt.Connect(tb.wsURL, nil)
b.NewPage(nil)
}
10 changes: 9 additions & 1 deletion tests/test_browser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/grafana/xk6-browser/api"
"github.com/grafana/xk6-browser/chromium"
"github.com/grafana/xk6-browser/common"
"github.com/grafana/xk6-browser/k6ext"
"github.com/grafana/xk6-browser/k6ext/k6test"

Expand All @@ -32,7 +33,8 @@ type testBrowser struct {
vu *k6test.VU
logCache *logCache

pid int // the browser process ID
pid int // the browser process ID
wsURL string

api.Browser
}
Expand Down Expand Up @@ -110,7 +112,12 @@ func newTestBrowser(tb testing.TB, opts ...any) *testBrowser {
state.TLSConfig = testServer.TLSClientConfig
state.Transport = testServer.HTTPTransport
}

b, pid := bt.Launch(rt.ToValue(launchOpts))
cb, ok := b.(*common.Browser)
if !ok {
panic(fmt.Errorf("testBrowser: unexpected browser %T", b))
}

tb.Cleanup(func() {
select {
Expand All @@ -130,6 +137,7 @@ func newTestBrowser(tb testing.TB, opts ...any) *testBrowser {
logCache: lc,
Browser: b,
pid: pid,
wsURL: cb.WsURL(),
}
if enableFileServer {
tbr = tbr.withFileServer()
Expand Down