Skip to content

Commit

Permalink
added capablties to webdirver session
Browse files Browse the repository at this point in the history
  • Loading branch information
adranwit committed Apr 25, 2024
1 parent c745708 commit c194250
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
11 changes: 6 additions & 5 deletions service/testing/runner/webdriver/contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ const (

// StartRequest represents a selenium server start request
type StartRequest struct {
Target *location.Resource
Driver string
Server string
Sdk string
Port int
Target *location.Resource
Driver string
Server string
Sdk string
Capabilities []string
Port int
}

func (r *StartRequest) Init() error {
Expand Down
5 changes: 4 additions & 1 deletion service/testing/runner/webdriver/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,9 @@ func (s *service) start(context *endly.Context, request *StartRequest) (*StartRe
session = &Session{SessionID: sessionID}
sessions[sessionID] = session
}

useSelenium := request.Server != ""
if !useSelenium {
session.Capabilities = request.Capabilities
switch request.Driver {
case ChromeDriver:
if session.service, err = selenium.NewChromeDriverService(response.DriverPath, request.Port); err != nil {
Expand Down Expand Up @@ -550,6 +550,9 @@ func (s *service) openSession(context *endly.Context, request *OpenSessionReques

caps := selenium.Capabilities{}
if session.Pid == 0 {
if len(session.Capabilities) > 0 && len(request.Capabilities) == 0 {
request.Capabilities = session.Capabilities
}
switch session.Browser {
case ChromeBrowser:
caps.AddChrome(chrome.Capabilities{Args: request.Capabilities})
Expand Down
13 changes: 7 additions & 6 deletions service/testing/runner/webdriver/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import (

// Session represents a selenium session
type Session struct {
SessionID string
Browser string
Pid int
Server string
driver selenium.WebDriver
service *selenium.Service
SessionID string
Browser string
Pid int
Server string
driver selenium.WebDriver
service *selenium.Service
Capabilities []string
}

func (s Session) Close() {
Expand Down

0 comments on commit c194250

Please sign in to comment.