Refactor Parse to accept a logger

Author: inancgumus

chromium/browser_type.go

@@ -133,7 +133,7 @@ func (b *BrowserType) Launch(opts goja.Value) api.Browser {
 	}
 
 	launchOpts := common.NewLaunchOptions()
-	if err := launchOpts.Parse(ctx, opts); err != nil {
+	if err := launchOpts.Parse(ctx, opts, b.logger); err != nil {
 		k6ext.Panic(ctx, "parsing launch options: %w", err)
 	}
 	ctx = common.WithLaunchOptions(ctx, launchOpts)

common/browser_options.go

@@ -8,6 +8,7 @@ import (
 	"github.com/dop251/goja"
 
 	"github.com/grafana/xk6-browser/k6ext"
+	"github.com/grafana/xk6-browser/log"
 )
 
 // ProxyOptions allows configuring a proxy server.
@@ -41,17 +42,16 @@ type LaunchPersistentContextOptions struct {
 
 // NewLaunchOptions returns a new LaunchOptions.
 func NewLaunchOptions() *LaunchOptions {
-	launchOpts := LaunchOptions{
+	return &LaunchOptions{
 		Env:               make(map[string]string),
 		Headless:          true,
 		LogCategoryFilter: ".*",
 		Timeout:           DefaultTimeout,
 	}
-	return &launchOpts
 }
 
 // Parse parses launch options from a JS object.
-func (l *LaunchOptions) Parse(ctx context.Context, opts goja.Value) error { //nolint:cyclop
+func (l *LaunchOptions) Parse(ctx context.Context, opts goja.Value, logger *log.Logger) error { //nolint:cyclop
 	if !gojaValueExists(opts) {
 		return errors.New("LaunchOptions does not exist in the runtime")
 	}

common/browser_options_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/xk6-browser/k6ext/k6test"
+	"github.com/grafana/xk6-browser/log"
 )
 
 func TestBrowserLaunchOptionsParse(t *testing.T) {
@@ -213,7 +214,7 @@ func TestBrowserLaunchOptionsParse(t *testing.T) {
 				vu = k6test.NewVU(t)
 				lo = NewLaunchOptions()
 			)
-			err := lo.Parse(vu.Context(), vu.ToGojaValue(tt.opts))
+			err := lo.Parse(vu.Context(), vu.ToGojaValue(tt.opts), log.NewNullLogger())
 			if tt.err != "" {
 				require.ErrorContains(t, err, tt.err)
 			} else {

common/browser_test.go

@@ -23,7 +23,8 @@ func TestBrowserNewPageInContext(t *testing.T) {
 	}
 	newTestCase := func(id cdp.BrowserContextID) *testCase {
 		ctx, cancel := context.WithCancel(context.Background())
-		b := newBrowser(ctx, cancel, nil, NewLaunchOptions(), log.NewNullLogger())
+		logger := log.NewNullLogger()
+		b := newBrowser(ctx, cancel, nil, NewLaunchOptions(), logger)
 		// set a new browser context in the browser with `id`, so that newPageInContext can find it.
 		b.contexts[id] = NewBrowserContext(ctx, b, id, nil, nil)
 		return &testCase{