Merge pull request #166 from grafana/refactor/move-ws-test-server

Move websocket test server to its own package

Author: inancgumus

common/connection_test.go

@@ -33,11 +33,12 @@ import (
 	"github.com/mailru/easyjson"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/xk6-browser/tests/ws"
 )
 
 func TestConnection(t *testing.T) {
-	server := NewWSServerWithEcho(t)
-	defer server.Cleanup()
+	server := ws.NewServer(t, ws.WithEchoHandler("/echo"))
 
 	t.Run("connect", func(t *testing.T) {
 		ctx := context.Background()
@@ -51,8 +52,7 @@ func TestConnection(t *testing.T) {
 }
 
 func TestConnectionClosureAbnormal(t *testing.T) {
-	server := NewWSServerWithClosureAbnormal(t)
-	defer server.Cleanup()
+	server := ws.NewServer(t, ws.WithClosureAbnormalHandler("/closure-abnormal"))
 
 	t.Run("closure abnormal", func(t *testing.T) {
 		ctx := context.Background()
@@ -69,8 +69,7 @@ func TestConnectionClosureAbnormal(t *testing.T) {
 }
 
 func TestConnectionSendRecv(t *testing.T) {
-	server := NewWSServerWithCDPHandler(t, CDPDefaultHandler, nil)
-	defer server.Cleanup()
+	server := ws.NewServer(t, ws.WithCDPHandler("/cdp", ws.CDPDefaultHandler, nil))
 
 	t.Run("send command with empty reply", func(t *testing.T) {
 		ctx := context.Background()
@@ -109,19 +108,19 @@ func TestConnectionCreateSession(t *testing.T) {
 					writeCh <- cdproto.Message{
 						Method: cdproto.EventTargetAttachedToTarget,
 						Params: easyjson.RawMessage([]byte(`
-                            {
-                                "sessionId": "0123456789",
-                                "targetInfo": {
-                                    "targetId": "abcdef0123456789",
-                                    "type": "page",
-                                    "title": "",
-                                    "url": "about:blank",
-                                    "attached": true,
-                                    "browserContextId": "0123456789876543210"
-                                },
-                                "waitingForDebugger": false
-                            }
-                        `)),
+						{
+							"sessionId": "0123456789",
+							"targetInfo": {
+								"targetId": "abcdef0123456789",
+								"type": "page",
+								"title": "",
+								"url": "about:blank",
+								"attached": true,
+								"browserContextId": "0123456789876543210"
+							},
+							"waitingForDebugger": false
+						}
+						`)),
 					}
 					writeCh <- cdproto.Message{
 						ID:        msg.ID,
@@ -133,8 +132,7 @@ func TestConnectionCreateSession(t *testing.T) {
 		}
 	}
 
-	server := NewWSServerWithCDPHandler(t, handler, &cmdsReceived)
-	defer server.Cleanup()
+	server := ws.NewServer(t, ws.WithCDPHandler("/cdp", handler, &cmdsReceived))
 
 	t.Run("create session for target", func(t *testing.T) {
 		ctx := context.Background()

common/session_test.go

@@ -34,9 +34,36 @@ import (
 	"github.com/mailru/easyjson"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/xk6-browser/tests/ws"
 )
 
 func TestSessionCreateSession(t *testing.T) {
+	const (
+		cdpTargetID         = "target_id_0123456789"
+		cdpBrowserContextID = "browser_context_id_0123456789"
+
+		targetAttachedToTargetEvent = `
+		{
+			"sessionId": "session_id_0123456789",
+			"targetInfo": {
+				"targetId": "target_id_0123456789",
+				"type": "page",
+				"title": "",
+				"url": "about:blank",
+				"attached": true,
+				"browserContextId": "browser_context_id_0123456789"
+			},
+			"waitingForDebugger": false
+		}`
+
+		targetAttachedToTargetResult = `
+		{
+			"sessionId":"session_id_0123456789"
+		}
+		`
+	)
+
 	cmdsReceived := make([]cdproto.MethodType, 0)
 	handler := func(conn *websocket.Conn, msg *cdproto.Message, writeCh chan cdproto.Message, done chan struct{}) {
 		if msg.SessionID != "" && msg.Method != "" {
@@ -59,19 +86,18 @@ func TestSessionCreateSession(t *testing.T) {
 			case cdproto.MethodType(cdproto.CommandTargetAttachToTarget):
 				writeCh <- cdproto.Message{
 					Method: cdproto.EventTargetAttachedToTarget,
-					Params: easyjson.RawMessage([]byte(DEFAULT_CDP_TARGET_ATTACHED_TO_TARGET_MSG)),
+					Params: easyjson.RawMessage([]byte(targetAttachedToTargetEvent)),
 				}
 				writeCh <- cdproto.Message{
 					ID:        msg.ID,
 					SessionID: msg.SessionID,
-					Result:    easyjson.RawMessage([]byte(DEFAULT_CDP_TARGET_ATTACH_TO_TARGET_RESPONSE)),
+					Result:    easyjson.RawMessage([]byte(targetAttachedToTargetResult)),
 				}
 			}
 		}
 	}
 
-	server := NewWSServerWithCDPHandler(t, handler, &cmdsReceived)
-	defer server.Cleanup()
+	server := ws.NewServer(t, ws.WithCDPHandler("/cdp", handler, &cmdsReceived))
 
 	t.Run("send and recv session commands", func(t *testing.T) {
 		ctx := context.Background()
@@ -81,9 +107,9 @@ func TestSessionCreateSession(t *testing.T) {
 
 		if assert.NoError(t, err) {
 			session, err := conn.createSession(&target.Info{
-				TargetID:         DEFAULT_CDP_TARGET_ID,
 				Type:             "page",
-				BrowserContextID: DEFAULT_CDP_BROWSER_CONTEXT_ID,
+				TargetID:         cdpTargetID,
+				BrowserContextID: cdpBrowserContextID,
 			})
 
 			if assert.NoError(t, err) {