From e9f609862431cf1063f32d9520d5f80d87a263ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Fri, 29 Nov 2019 00:28:00 +0100
Subject: [PATCH 1/3] Do not load root babel.config.js in esilnt tests

---
 eslint/babel-eslint-parser/test/integration.js    | 2 ++
 eslint/babel-eslint-parser/test/non-regression.js | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/eslint/babel-eslint-parser/test/integration.js b/eslint/babel-eslint-parser/test/integration.js
index ecad41bdd0b7..d2df877c562e 100644
--- a/eslint/babel-eslint-parser/test/integration.js
+++ b/eslint/babel-eslint-parser/test/integration.js
@@ -16,6 +16,8 @@ const baseEslintOpts = {
   parser: "current-babel-eslint",
   parserOptions: {
     sourceType: "script",
+    requireConfigFile: false,
+    babelOptions: { configFile: false }
   },
 };
 
diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index b1feb30eabb7..1b347e858d5b 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -18,26 +18,23 @@ function verifyAndAssertMessagesWithSpecificESLint(
       node: true,
       es6: true,
     },
+    ...overrideConfig,
     parserOptions: {
       sourceType,
       ecmaFeatures: {
         globalReturn: true,
       },
+      requireConfigFile: false,
       babelOptions: {
         configFile: path.resolve(
           __dirname,
           "./fixtures/config/babel.config.js",
         ),
       },
+      ...overrideConfig?.parserOptions
     },
   };
 
-  if (overrideConfig) {
-    for (const key in overrideConfig) {
-      config[key] = overrideConfig[key];
-    }
-  }
-
   const messages = linter.verify(code, config);
 
   if (messages.length !== expectedMessages.length) {

From 924aaac4565fe5ffb0709d0a3a1e28c74cd049a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Mon, 9 Dec 2019 17:29:04 -0500
Subject: [PATCH 2/3] add testcase: sourceType: script + globalReturn: true

---
 .../test/non-regression.js                    | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index 1b347e858d5b..1891ea5e4df4 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -31,7 +31,7 @@ function verifyAndAssertMessagesWithSpecificESLint(
           "./fixtures/config/babel.config.js",
         ),
       },
-      ...overrideConfig?.parserOptions
+      ...overrideConfig?.parserOptions,
     },
   };
 
@@ -1563,7 +1563,7 @@ describe("verify", () => {
     );
   });
 
-  it("no-implicit-globals in script", () => {
+  it("no-implicit-globals in script: globalReturn is false", () => {
     verifyAndAssertMessages(
       "var leakedGlobal = 1;",
       { "no-implicit-globals": 1 },
@@ -1573,7 +1573,28 @@ describe("verify", () => {
       "script",
       {
         env: {},
-        parserOptions: { ecmaVersion: 6, sourceType: "script" },
+        parserOptions: {
+          ecmaVersion: 6,
+          sourceType: "script",
+          ecmaFeatures: { globalReturn: false },
+        },
+      },
+    );
+  });
+
+  it("no-implicit-globals in script: globalReturn is true", () => {
+    verifyAndAssertMessages(
+      "var leakedGlobal = 1;",
+      { "no-implicit-globals": 1 },
+      [],
+      "script",
+      {
+        env: {},
+        parserOptions: {
+          ecmaVersion: 6,
+          sourceType: "script",
+          ecmaFeatures: { globalReturn: true },
+        },
       },
     );
   });

From 1dd0145db1c1dac7f46d463bb38046e14f16f92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Mon, 9 Dec 2019 18:16:07 -0500
Subject: [PATCH 3/3] chore: remove globalReturn on default test config

---
 eslint/babel-eslint-parser/test/non-regression.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index 1891ea5e4df4..63aadea4b33a 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -21,9 +21,6 @@ function verifyAndAssertMessagesWithSpecificESLint(
     ...overrideConfig,
     parserOptions: {
       sourceType,
-      ecmaFeatures: {
-        globalReturn: true,
-      },
       requireConfigFile: false,
       babelOptions: {
         configFile: path.resolve(