optimize js package test by using compatibility mode base by default

grafana · Apr 30, 2020 · d3f563a · d3f563a
1 parent 284d3e3
commit d3f563a
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 135 deletions.
diff --git a/js/console_test.go b/js/console_test.go
@@ -73,7 +73,7 @@ func TestConsoleContext(t *testing.T) {
 func getSimpleRunner(filename, data string, opts ...interface{}) (*Runner, error) {
 	var (
 		fs     = afero.NewMemMapFs()
-		rtOpts = lib.RuntimeOptions{}
+		rtOpts = lib.RuntimeOptions{CompatibilityMode: null.NewString("base", true)}
 	)
 	for _, o := range opts {
 		switch opt := o.(type) {
@@ -117,7 +117,7 @@ func TestConsole(t *testing.T) {
 				args, result := args, result
 				t.Run(args, func(t *testing.T) {
 					r, err := getSimpleRunner("/script.js", fmt.Sprintf(
-						`export default function() { console.%s(%s); }`,
+						`exports.default = function() { console.%s(%s); }`,
 						name, args,
 					))
 					assert.NoError(t, err)
@@ -209,7 +209,7 @@ func TestFileConsole(t *testing.T) {
 							}
 							r, err := getSimpleRunner("/script",
 								fmt.Sprintf(
-									`export default function() { console.%s(%s); }`,
+									`exports.default = function() { console.%s(%s); }`,
 									name, args,
 								))
 							assert.NoError(t, err)

diff --git a/js/module_loading_test.go b/js/module_loading_test.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
+	null "gopkg.in/guregu/null.v3"
 
 	"github.com/loadimpact/k6/lib"
 	"github.com/loadimpact/k6/lib/testutils/httpmultibin"
@@ -99,7 +100,7 @@ func TestLoadOnceGlobalVars(t *testing.T) {
 					throw new Error("A() != B()    (" + A() + ") != (" + B() + ")");
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 			require.NoError(t, err)
 
 			arc := r1.MakeArchive()
@@ -148,7 +149,7 @@ func TestLoadExportsIsUsableInModule(t *testing.T) {
 					throw new Error("wrong value of B() " + B());
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	arc := r1.MakeArchive()
@@ -194,7 +195,7 @@ func TestLoadDoesntBreakHTTPGet(t *testing.T) {
 					throw new Error("wrong status "+ resp.status);
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	require.NoError(t, r1.SetOptions(lib.Options{Hosts: tb.Dialer.Hosts}))
@@ -239,7 +240,7 @@ func TestLoadGlobalVarsAreNotSharedBetweenVUs(t *testing.T) {
 					throw new Error("wrong value of a " + a);
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	arc := r1.MakeArchive()
@@ -302,7 +303,7 @@ func TestLoadCycle(t *testing.T) {
 	`), os.ModePerm))
 	data, err := afero.ReadFile(fs, "/main.js")
 	require.NoError(t, err)
-	r1, err := getSimpleRunner("/main.js", string(data), fs)
+	r1, err := getSimpleRunner("/main.js", string(data), fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	arc := r1.MakeArchive()
@@ -364,7 +365,7 @@ func TestLoadCycleBinding(t *testing.T) {
 					throw new Error("Wrong value of bar() "+ barMessage);
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	arc := r1.MakeArchive()
@@ -428,7 +429,7 @@ func TestBrowserified(t *testing.T) {
 					throw new Error("bravo.B() != 'b'    (" + bravo.B() + ") != 'b'");
 				}
 			}
-		`, fs)
+		`, fs, lib.RuntimeOptions{CompatibilityMode: null.StringFrom("extended")})
 	require.NoError(t, err)
 
 	arc := r1.MakeArchive()
@@ -459,7 +460,7 @@ func TestLoadingUnexistingModuleDoesntPanic(t *testing.T) {
 			} catch (err) {
 				b = "correct";
 			}
-			export default function() {
+			exports.default = function() {
 				if (b != "correct") {
 					throw new Error("wrong b "+ JSON.stringify(b));
 				}