Merge pull request #2192 from grafana/dropRunES6String

Drop runES6String as it's no longer needed
grafana · Oct 24, 2021 · a572c1c · a572c1c
2 parents 66ed1ae + 2e46f94
commit a572c1c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 49 deletions.
diff --git a/js/modules/k6/http/http_test.go b/js/modules/k6/http/http_test.go
@@ -48,7 +48,7 @@ func TestTagURL(t *testing.T) {
 		t.Run("expr="+expr, func(t *testing.T) {
 			tag, err := httpext.NewURL(data.u, data.n)
 			require.NoError(t, err)
-			v, err := runES6String(t, rt, "http.url`"+expr+"`")
+			v, err := rt.RunString("http.url`" + expr + "`")
 			if assert.NoError(t, err) {
 				assert.Equal(t, tag, v.Export())
 			}

diff --git a/js/modules/k6/http/request_test.go b/js/modules/k6/http/request_test.go
@@ -49,38 +49,13 @@ import (
 	"gopkg.in/guregu/null.v3"
 
 	"go.k6.io/k6/js/common"
-	"go.k6.io/k6/js/compiler"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/metrics"
 	"go.k6.io/k6/lib/testutils"
 	"go.k6.io/k6/lib/testutils/httpmultibin"
 	"go.k6.io/k6/stats"
 )
 
-// runES6String Runs an ES6 string in the given runtime. Use this rather than writing ES5 in tests.
-func runES6String(tb testing.TB, rt *goja.Runtime, src string) (goja.Value, error) {
-	var err error
-	c := compiler.New(testutils.NewLogger(tb)) // TODO drop it ? maybe we will drop babel and this will be less needed
-	src, _, err = c.Transform(src, "__string__")
-	if err != nil {
-		return goja.Undefined(), err
-	}
-
-	return rt.RunString(src)
-}
-
-func TestRunES6String(t *testing.T) {
-	t.Run("Valid", func(t *testing.T) {
-		_, err := runES6String(t, goja.New(), `let a = 1;`)
-		assert.NoError(t, err)
-	})
-	t.Run("Invalid", func(t *testing.T) {
-		_, err := runES6String(t, goja.New(), `let a = #;`)
-		assert.NotNil(t, err)
-		assert.Contains(t, err.Error(), "SyntaxError: __string__: Unexpected character '#' (1:8)\n> 1 | let a = #;\n")
-	})
-}
-
 // TODO replace this with the Single version
 func assertRequestMetricsEmitted(t *testing.T, sampleContainers []stats.SampleContainer, method, url, name string, status int, group string) {
 	if name == "" {
@@ -1091,7 +1066,7 @@ func TestRequestAndBatch(t *testing.T) {
 			})
 
 			t.Run("name/template", func(t *testing.T) {
-				_, err := runES6String(t, rt, "http.get(http.url`"+sr(`HTTPBIN_URL/anything/${1+1}`)+"`);")
+				_, err := rt.RunString("http.get(http.url`" + sr(`HTTPBIN_URL/anything/${1+1}`) + "`);")
 				assert.NoError(t, err)
 				// There's no /anything endpoint in the go-httpbin library we're using, hence the 404,
 				// but it doesn't matter for this test.
@@ -1163,10 +1138,10 @@ func TestRequestAndBatch(t *testing.T) {
 		assertRequestMetricsEmitted(t, stats.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/get?a=1&b=2"), "", 200, "")
 
 		t.Run("Tagged", func(t *testing.T) {
-			_, err := runES6String(t, rt, `
+			_, err := rt.RunString(`
 			var a = "1";
 			var b = "2";
-			var res = http.get(http.url`+"`"+sr(`HTTPBIN_URL/get?a=${a}&b=${b}`)+"`"+`);
+			var res = http.get(http.url` + "`" + sr(`HTTPBIN_URL/get?a=${a}&b=${b}`) + "`" + `);
 			if (res.status != 200) { throw new Error("wrong status: " + res.status); }
 			if (res.json().args.a != a) { throw new Error("wrong ?a: " + res.json().args.a); }
 			if (res.json().args.b != b) { throw new Error("wrong ?b: " + res.json().args.b); }
@@ -1403,12 +1378,12 @@ func TestRequestAndBatch(t *testing.T) {
 			assertRequestMetricsEmitted(t, bufSamples, "GET", sr("HTTPBIN_IP_URL/"), "", 200, "")
 
 			t.Run("Tagged", func(t *testing.T) {
-				_, err := runES6String(t, rt, sr(`
+				_, err := rt.RunString(sr(`
 			{
 				let fragment = "get";
 				let reqs = [
-					["GET", http.url`+"`"+`HTTPBIN_URL/${fragment}`+"`"+`],
-					["GET", http.url`+"`"+`HTTPBIN_IP_URL/`+"`"+`],
+					["GET", http.url` + "`" + `HTTPBIN_URL/${fragment}` + "`" + `],
+					["GET", http.url` + "`" + `HTTPBIN_IP_URL/` + "`" + `],
 				];
 				let res = http.batch(reqs);
 				for (var key in res) {
@@ -1441,12 +1416,12 @@ func TestRequestAndBatch(t *testing.T) {
 				assertRequestMetricsEmitted(t, bufSamples, "GET", sr("HTTPBIN_IP_URL/"), "", 200, "")
 
 				t.Run("Tagged", func(t *testing.T) {
-					_, err := runES6String(t, rt, sr(`
+					_, err := rt.RunString(sr(`
 				{
 					let fragment = "get";
 					let reqs = [
-						http.url`+"`"+`HTTPBIN_URL/${fragment}`+"`"+`,
-						http.url`+"`"+`HTTPBIN_IP_URL/`+"`"+`,
+						http.url` + "`" + `HTTPBIN_URL/${fragment}` + "`" + `,
+						http.url` + "`" + `HTTPBIN_IP_URL/` + "`" + `,
 					];
 					let res = http.batch(reqs);
 					for (var key in res) {
@@ -1759,8 +1734,8 @@ func TestRequestCompression(t *testing.T) {
 			}
 			expectedEncoding = strings.Join(algos, ", ")
 			actualEncoding = expectedEncoding
-			_, err := runES6String(t, rt, tb.Replacer.Replace(`
-		http.post("HTTPBIN_URL/compressed-text", `+"`"+text+"`"+`,  {"compression": "`+testCase.compression+`"});
+			_, err := rt.RunString(tb.Replacer.Replace(`
+		http.post("HTTPBIN_URL/compressed-text", ` + "`" + text + "`" + `,  {"compression": "` + testCase.compression + `"});
 	`))
 			if testCase.expectedError == "" {
 				require.NoError(t, err)
@@ -1777,10 +1752,10 @@ func TestRequestCompression(t *testing.T) {
 
 		logHook.Drain()
 		t.Run("encoding", func(t *testing.T) {
-			_, err := runES6String(t, rt, tb.Replacer.Replace(`
-				http.post("HTTPBIN_URL/compressed-text", `+"`"+text+"`"+`,
-					{"compression": "`+actualEncoding+`",
-					 "headers": {"Content-Encoding": "`+expectedEncoding+`"}
+			_, err := rt.RunString(tb.Replacer.Replace(`
+				http.post("HTTPBIN_URL/compressed-text", ` + "`" + text + "`" + `,
+					{"compression": "` + actualEncoding + `",
+					 "headers": {"Content-Encoding": "` + expectedEncoding + `"}
 					}
 				);
 			`))
@@ -1789,10 +1764,10 @@ func TestRequestCompression(t *testing.T) {
 		})
 
 		t.Run("encoding and length", func(t *testing.T) {
-			_, err := runES6String(t, rt, tb.Replacer.Replace(`
-				http.post("HTTPBIN_URL/compressed-text", `+"`"+text+"`"+`,
-					{"compression": "`+actualEncoding+`",
-					 "headers": {"Content-Encoding": "`+expectedEncoding+`",
+			_, err := rt.RunString(tb.Replacer.Replace(`
+				http.post("HTTPBIN_URL/compressed-text", ` + "`" + text + "`" + `,
+					{"compression": "` + actualEncoding + `",
+					 "headers": {"Content-Encoding": "` + expectedEncoding + `",
 								 "Content-Length": "12"}
 					}
 				);
@@ -1803,10 +1778,10 @@ func TestRequestCompression(t *testing.T) {
 
 		expectedEncoding = actualEncoding
 		t.Run("correct encoding", func(t *testing.T) {
-			_, err := runES6String(t, rt, tb.Replacer.Replace(`
-				http.post("HTTPBIN_URL/compressed-text", `+"`"+text+"`"+`,
-					{"compression": "`+actualEncoding+`",
-					 "headers": {"Content-Encoding": "`+actualEncoding+`"}
+			_, err := rt.RunString(tb.Replacer.Replace(`
+				http.post("HTTPBIN_URL/compressed-text", ` + "`" + text + "`" + `,
+					{"compression": "` + actualEncoding + `",
+					 "headers": {"Content-Encoding": "` + actualEncoding + `"}
 					}
 				);
 			`))