Merge pull request #340 from vania-pooh/master

Showing labels from extension capabilities

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
 
       - uses: actions/cache@v1
         with:

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
 
       - uses: actions/cache@v1
         with:

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
 
       - uses: actions/cache@v1
         with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3
 
 RUN apk add -U tzdata ca-certificates && rm -Rf /var/cache/apk/*
 COPY ggr /usr/bin

go.mod

@@ -1,6 +1,6 @@
 module github.com/aerokube/ggr
 
-		go 1.15
+go 1.16
 
 require (
 	github.com/aandryashin/matchers v0.0.0-20160729131923-5eb67beb188b

proxy.go

@@ -98,6 +98,11 @@ func (c caps) capabilities(fn func(m map[string]interface{}, w3c bool)) {
 				if alwaysMatch, ok := m[keys.alwaysMatch]; ok {
 					if m, ok := alwaysMatch.(map[string]interface{}); ok {
 						fn(m, true)
+						for k, v := range m { // Extension capabilities have ":" in key
+							if ec, ok := v.(map[string]interface{}); ok && strings.Contains(k, ":") {
+								fn(ec, true)
+							}
+						}
 					}
 				}
 			}

proxy_test.go

@@ -880,7 +880,7 @@ func TestStartSessionWithDefaultVersionW3C(t *testing.T) {
 	mux.HandleFunc("/wd/hub/session", postOnly(func(w http.ResponseWriter, r *http.Request) {
 		body, _ := ioutil.ReadAll(r.Body)
 		r.Body.Close()
-		var sess map[string]map[string]map[string]string
+		var sess map[string]map[string]map[string]interface{}
 		err := json.Unmarshal(body, &sess)
 		w.Write([]byte(`{"sessionId":"123"}`))
 		AssertThat(t, err, Is{nil})
@@ -911,7 +911,7 @@ func TestStartSessionWithDefaultVersionW3C(t *testing.T) {
 		}}}}
 	updateQuota(user, browsers)
 
-	createSession(`{"capabilities":{"alwaysMatch":{"browserName":"browser"}}}`)
+	createSession(`{"capabilities":{"alwaysMatch":{"browserName":"browser", "selenoid:options": {"labels": {"some-key": "some-value"}}}}}`)
 }
 
 func TestClientClosedConnection(t *testing.T) {