Skip to content

Commit b29a16b

Browse files
mdjermanovicmdjermanovic
authored
chore: fix several cli tests to run in the intended flat config mode (#17797)
1 parent fffca5c commit b29a16b

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

‎tests/lib/cli.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe("cli", () => {
6363

6464
const localCLI = proxyquire("../../lib/cli", {
6565
"./eslint": { ESLint: fakeESLint },
66-
"./flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
66+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(configType === "flat") },
6767
"./shared/logging": log
6868
});
6969

@@ -990,7 +990,7 @@ describe("cli", () => {
990990

991991
localCLI = proxyquire("../../lib/cli", {
992992
"./eslint": { ESLint: fakeESLint },
993-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
993+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
994994
"./shared/logging": log
995995
});
996996

@@ -1009,7 +1009,7 @@ describe("cli", () => {
10091009

10101010
localCLI = proxyquire("../../lib/cli", {
10111011
"./eslint": { ESLint: fakeESLint },
1012-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1012+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
10131013
"./shared/logging": log
10141014
});
10151015

@@ -1040,7 +1040,7 @@ describe("cli", () => {
10401040

10411041
localCLI = proxyquire("../../lib/cli", {
10421042
"./eslint": { ESLint: fakeESLint },
1043-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1043+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
10441044
"./shared/logging": log
10451045
});
10461046

@@ -1076,7 +1076,7 @@ describe("cli", () => {
10761076

10771077
localCLI = proxyquire("../../lib/cli", {
10781078
"./eslint": { ESLint: fakeESLint },
1079-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1079+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
10801080

10811081
"./shared/logging": log
10821082
});
@@ -1113,7 +1113,7 @@ describe("cli", () => {
11131113

11141114
localCLI = proxyquire("../../lib/cli", {
11151115
"./eslint": { ESLint: fakeESLint },
1116-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1116+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
11171117

11181118
"./shared/logging": log
11191119
});
@@ -1131,12 +1131,12 @@ describe("cli", () => {
11311131

11321132
localCLI = proxyquire("../../lib/cli", {
11331133
"./eslint": { ESLint: fakeESLint },
1134-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1134+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
11351135

11361136
"./shared/logging": log
11371137
});
11381138

1139-
const exitCode = await localCLI.execute("--fix .", "foo = bar;", null, useFlatConfig);
1139+
const exitCode = await localCLI.execute("--fix .", "foo = bar;", useFlatConfig);
11401140

11411141
assert.strictEqual(exitCode, 2);
11421142
});
@@ -1162,7 +1162,7 @@ describe("cli", () => {
11621162

11631163
localCLI = proxyquire("../../lib/cli", {
11641164
"./eslint": { ESLint: fakeESLint },
1165-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1165+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
11661166

11671167
"./shared/logging": log
11681168
});
@@ -1190,7 +1190,7 @@ describe("cli", () => {
11901190

11911191
localCLI = proxyquire("../../lib/cli", {
11921192
"./eslint": { ESLint: fakeESLint },
1193-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1193+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
11941194

11951195
"./shared/logging": log
11961196
});
@@ -1225,7 +1225,7 @@ describe("cli", () => {
12251225

12261226
localCLI = proxyquire("../../lib/cli", {
12271227
"./eslint": { ESLint: fakeESLint },
1228-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1228+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
12291229

12301230
"./shared/logging": log
12311231
});
@@ -1262,7 +1262,7 @@ describe("cli", () => {
12621262

12631263
localCLI = proxyquire("../../lib/cli", {
12641264
"./eslint": { ESLint: fakeESLint },
1265-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1265+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
12661266

12671267
"./shared/logging": log
12681268
});
@@ -1298,7 +1298,7 @@ describe("cli", () => {
12981298

12991299
localCLI = proxyquire("../../lib/cli", {
13001300
"./eslint": { ESLint: fakeESLint },
1301-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1301+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
13021302

13031303
"./shared/logging": log
13041304
});
@@ -1315,7 +1315,7 @@ describe("cli", () => {
13151315

13161316
localCLI = proxyquire("../../lib/cli", {
13171317
"./eslint": { ESLint: fakeESLint },
1318-
"./eslint/flat-eslint": { ESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(false) },
1318+
"./eslint/flat-eslint": { FlatESLint: fakeESLint, shouldUseFlatConfig: () => Promise.resolve(useFlatConfig) },
13191319

13201320
"./shared/logging": log
13211321
});

0 commit comments

Comments
 (0)