Ability to set custom screen resolution. Fix #35.

doc.go

@@ -1,4 +1,4 @@
 /*
-Selenoid is a powerful implementation of Selenium Hub using Docker or standalone web driver binaries to start and launch browsers. Documentation has moved to: http://github.com/aandryashin/selenoid 
+Selenoid is a powerful implementation of Selenium Hub using Docker or standalone web driver binaries to start and launch browsers. Documentation has moved to: http://github.com/aandryashin/selenoid
 */
 package main

selenoid.go

@@ -10,6 +10,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httputil"
+	"regexp"
 	"strings"
 	"time"
 
@@ -79,8 +80,9 @@ func create(w http.ResponseWriter, r *http.Request) {
 	}
 	var browser struct {
 		Caps struct {
-			Name    string `json:"browserName"`
-			Version string `json:"version"`
+			Name             string `json:"browserName"`
+			Version          string `json:"version"`
+			ScreenResolution string `json:"screenResolution"`
 		} `json:"desiredCapabilities"`
 	}
 	err = json.Unmarshal(body, &browser)
@@ -90,7 +92,15 @@ func create(w http.ResponseWriter, r *http.Request) {
 		queue.Drop()
 		return
 	}
-	starter, ok := manager.Find(browser.Caps.Name, &browser.Caps.Version)
+	if browser.Caps.ScreenResolution != "" {
+		exp := regexp.MustCompile(`^[0-9]+x[0-9]+x(8|16|24)$`)
+		if !exp.MatchString(browser.Caps.ScreenResolution) {
+			http.Error(w, "Malformed screenResolution capability.", http.StatusBadRequest)
+			queue.Drop()
+			return
+		}
+	}
+	starter, ok := manager.Find(browser.Caps.Name, &browser.Caps.Version, browser.Caps.ScreenResolution)
 	if !ok {
 		log.Printf("[ENVIRONMENT_NOT_AVAILABLE] [%s-%s]\n", browser.Caps.Name, browser.Caps.Version)
 		http.Error(w, "Requested environment is not available", http.StatusBadRequest)

selenoid_test.go

@@ -62,6 +62,16 @@ func TestBrowserNotFound(t *testing.T) {
 	AssertThat(t, queue.Used(), EqualTo{0})
 }
 
+func TestMalformedScreeResolutionCapability(t *testing.T) {
+	manager = &BrowserNotFound{}
+
+	rsp, err := http.Post(With(srv.URL).Path("/wd/hub/session"), "", bytes.NewReader([]byte(`{"desiredCapabilities":{"screenResolution":"1024x768"}}`)))
+	AssertThat(t, err, Is{nil})
+	AssertThat(t, rsp, Code{http.StatusBadRequest})
+
+	AssertThat(t, queue.Used(), EqualTo{0})
+}
+
 func TestNewSessionNotFound(t *testing.T) {
 	manager = &HTTPTest{Handler: Selenium()}
 

service/docker.go

@@ -20,10 +20,11 @@ import (
 
 // Docker - docker container manager
 type Docker struct {
-	IP        string
-	Client    *client.Client
-	Service   *config.Browser
-	LogConfig *container.LogConfig
+	IP               string
+	Client           *client.Client
+	Service          *config.Browser
+	LogConfig        *container.LogConfig
+	ScreenResolution string
 }
 
 // StartWithCancel - Starter interface implementation
@@ -34,7 +35,10 @@ func (docker *Docker) StartWithCancel() (*url.URL, func(), error) {
 	}
 	ctx := context.Background()
 	log.Println("Creating Docker container", docker.Service.Image, "...")
-	env := []string{fmt.Sprintf("TZ=%s", time.Local)}
+	env := []string{
+		fmt.Sprintf("TZ=%s", time.Local),
+		fmt.Sprintf("SCREEN_RESOLUTION=%s", docker.ScreenResolution),
+	}
 	resp, err := docker.Client.ContainerCreate(ctx,
 		&container.Config{
 			Hostname:     "localhost",

service/service.go

@@ -18,18 +18,18 @@ type Starter interface {
 
 // Manager - interface to choose appropriate starter
 type Manager interface {
-	Find(s string, v *string) (Starter, bool)
+	Find(s string, v *string, sr string) (Starter, bool)
 }
 
 // DefaultManager - struct for default implementation
 type DefaultManager struct {
-	IP        string
-	Client    *client.Client
-	Config    *config.Config
+	IP     string
+	Client *client.Client
+	Config *config.Config
 }
 
 // Find - default implementation Manager interface
-func (m *DefaultManager) Find(s string, v *string) (Starter, bool) {
+func (m *DefaultManager) Find(s string, v *string, sr string) (Starter, bool) {
 	log.Printf("Locating the service for %s %s\n", s, *v)
 	service, ok := m.Config.Find(s, v)
 	if !ok {
@@ -41,7 +41,7 @@ func (m *DefaultManager) Find(s string, v *string) (Starter, bool) {
 			return nil, false
 		}
 		log.Printf("Using docker service for %s %s\n", s, *v)
-		return &Docker{m.IP, m.Client, service, m.Config.ContainerLogs}, true
+		return &Docker{m.IP, m.Client, service, m.Config.ContainerLogs, sr}, true
 	case []interface{}:
 		log.Printf("Using driver service for %s %s\n", s, *v)
 		return &Driver{service}, true

utils_test.go

@@ -11,9 +11,10 @@ import (
 	"strings"
 	"sync"
 
+	"time"
+
 	"github.com/aandryashin/selenoid/service"
 	"github.com/pborman/uuid"
-	"time"
 )
 
 type HTTPTest struct {
@@ -52,7 +53,7 @@ func (m *HTTPTest) StartWithCancel() (*url.URL, func(), error) {
 	}, nil
 }
 
-func (m *HTTPTest) Find(s string, v *string) (service.Starter, bool) {
+func (m *HTTPTest) Find(s string, v *string, sr string) (service.Starter, bool) {
 	return m, true
 }
 
@@ -64,13 +65,13 @@ func (m *StartupError) StartWithCancel() (*url.URL, func(), error) {
 	return nil, nil, errors.New("Failed to start Service")
 }
 
-func (m *StartupError) Find(s string, v *string) (service.Starter, bool) {
+func (m *StartupError) Find(s string, v *string, sr string) (service.Starter, bool) {
 	return m, true
 }
 
 type BrowserNotFound struct{}
 
-func (m *BrowserNotFound) Find(s string, v *string) (service.Starter, bool) {
+func (m *BrowserNotFound) Find(s string, v *string, sr string) (service.Starter, bool) {
 	return nil, false
 }