chore: enhance tests

grafana · Jul 25, 2022 · f081ebe · f081ebe
1 parent 120befd
commit f081ebe
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/js/modules/k6/ws/ws.go b/js/modules/k6/ws/ws.go
@@ -288,12 +288,13 @@ func (mi *WS) Connect(url string, args ...goja.Value) (*WSHTTPResponse, error) {
 		socket.handleEvent("error", rt.ToValue(connErr))
 		if state.Options.Throw.Bool {
 			return nil, connErr
-		} else {
-			if state.Logger != nil {
-				state.Logger.WithField("error", connErr).Warn("Ws Connection Failed")
-			}
-			return &WSHTTPResponse{}, nil
 		}
+		if state.Logger != nil {
+			state.Logger.WithField("error", connErr).Warn("Ws Connection Failed")
+		}
+		return &WSHTTPResponse{
+			Error: connErr.Error(),
+		}, nil
 	}
 
 	// Run the user-provided set up function

diff --git a/js/modules/k6/ws/ws_test.go b/js/modules/k6/ws/ws_test.go
@@ -1290,7 +1290,8 @@ func TestCookieJar(t *testing.T) {
 	assertSessionMetricsEmitted(t, metrics.GetBufferedSamples(ts.samples), "", sr("WSBIN_URL/ws-echo-someheader"), statusProtocolSwitch, "")
 }
 
-func TestWithoutThrowError(t *testing.T) {
+func TestWsWithThrowOptionError(t *testing.T) {
+	t.Parallel()
 	tb := httpmultibin.NewHTTPMultiBin(t)
 	root, err := lib.NewGroup("", nil)
 	require.NoError(t, err)
@@ -1303,7 +1304,6 @@ func TestWithoutThrowError(t *testing.T) {
 		Dialer: tb.Dialer,
 		Options: lib.Options{
 			SystemTags: &metrics.DefaultSystemTagSet,
-			Throw:      null.BoolFrom(false),
 		},
 		Samples:        samples,
 		BuiltinMetrics: metrics.RegisterBuiltinMetrics(metrics.NewRegistry()),
@@ -1317,12 +1317,31 @@ func TestWithoutThrowError(t *testing.T) {
 		StateField:   state,
 	})
 	require.NoError(t, rt.Set("ws", m.Exports().Default))
-	_, err = rt.RunString(`
+
+	t.Run("enable_throw_error", func(t *testing.T) {
+		state.Options.Throw = null.BoolFrom(true)
+		_, err = rt.RunString(`
+		var res = ws.connect("INVALID", function(socket){
+			socket.on("open", function() {
+				socket.close();
+			});
+		});
+		`)
+		assert.Error(t, err)
+	})
+
+	t.Run("disable_throw_error", func(t *testing.T) {
+		state.Options.Throw = null.BoolFrom(false)
+		_, err = rt.RunString(`
 		var res = ws.connect("INVALID", function(socket){
 			socket.on("open", function() {
 				socket.close();
 			});
 		});
+		if (res && res.error) {
+			throw new Error(res.error);
+		}
 		`)
-	assert.NoError(t, err)
+		assert.Error(t, err)
+	})
 }