Skip to content

fix(rule-tester): re-apply updates from main #9180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 30, 2024
Merged

fix(rule-tester): re-apply updates from main #9180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f23e26
fix(rule-tester): re-apply updates from main
JoshuaKGoldberg May 30, 2024
5ecff79
Undo removals
JoshuaKGoldberg May 30, 2024
07cf874
Redo removals
JoshuaKGoldberg May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 144 additions & 93 deletions packages/eslint-plugin-internal/tests/rules/plugin-test-formatting.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,18 @@ const test = [
},
{
code: wrap`'for (const x of y) {}'`,
output: `
ruleTester.run({
valid: [
{
code: \`for (const x of y) {
}\`,
},
],
});
`,
output: [
wrap`\`for (const x of y) {
}\``,
wrap`\`
for (const x of y) {
}
\``,
wrap`\`
for (const x of y) {
}
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'invalidFormatting',
Expand All @@ -225,16 +227,18 @@ ruleTester.run({
{
code: wrap`'for (const x of \`asdf\`) {}'`,
// make sure it escapes the backticks
output: `
ruleTester.run({
valid: [
{
code: \`for (const x of \\\`asdf\\\`) {
}\`,
},
],
});
`,
output: [
wrap`\`for (const x of \\\`asdf\\\`) {
}\``,
wrap`\`
for (const x of \\\`asdf\\\`) {
}
\``,
wrap`\`
for (const x of \\\`asdf\\\`) {
}
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'invalidFormatting',
Expand All @@ -254,15 +258,7 @@ ruleTester.run({
},
{
code: wrap`\`const a = '1'\``,
output: `
ruleTester.run({
valid: [
{
code: "const a = '1'",
},
],
});
`,
output: [wrap`"const a = '1'"`, wrap`"const a = '1';"`],
errors: [
{
messageId: 'singleLineQuotes',
Expand All @@ -271,15 +267,7 @@ ruleTester.run({
},
{
code: wrap`\`const a = "1";\``,
output: `
ruleTester.run({
valid: [
{
code: 'const a = "1";',
},
],
});
`,
output: [wrap`'const a = "1";'`, wrap`"const a = '1';"`],
errors: [
{
messageId: 'singleLineQuotes',
Expand All @@ -290,17 +278,14 @@ ruleTester.run({
{
code: wrap`\`const a = "1";
${PARENT_INDENT}\``,
output: `
ruleTester.run({
valid: [
{
code: \`
output: [
wrap`\`
const a = "1";
\`,
},
],
});
`,
${PARENT_INDENT}\``,
wrap`\`
const a = '1';
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'templateLiteralEmptyEnds',
Expand All @@ -310,17 +295,17 @@ const a = "1";
{
code: wrap`\`
${CODE_INDENT}const a = "1";\``,
output: `
ruleTester.run({
valid: [
{
code: \`
const a = "1";
\`,
},
],
});
`,
output: [
wrap`\`
${CODE_INDENT}const a = "1";
\``,
wrap`\`
${CODE_INDENT}const a = "1";
${PARENT_INDENT}\``,
wrap`\`
${CODE_INDENT}const a = '1';
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'templateLiteralEmptyEnds',
Expand All @@ -330,18 +315,20 @@ ruleTester.run({
{
code: wrap`\`const a = "1";
${CODE_INDENT}const b = "2";\``,
output: `
ruleTester.run({
valid: [
{
code: \`
output: [
wrap`\`
const a = "1";
const b = "2";
\`,
},
],
});
`,
${CODE_INDENT}const b = "2";
\``,
wrap`\`
const a = "1";
${CODE_INDENT}const b = "2";
${PARENT_INDENT}\``,
wrap`\`
const a = '1';
const b = '2';
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'templateLiteralEmptyEnds',
Expand All @@ -353,17 +340,14 @@ const a = "1";
code: wrap`\`
${CODE_INDENT}const a = "1";
\``,
output: `
ruleTester.run({
valid: [
{
code: \`
const a = "1";
\`,
},
],
});
`,
output: [
wrap`\`
${CODE_INDENT}const a = "1";
${PARENT_INDENT}\``,
wrap`\`
${CODE_INDENT}const a = '1';
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'templateLiteralLastLineIndent',
Expand All @@ -374,17 +358,14 @@ ruleTester.run({
code: wrap`\`
${CODE_INDENT}const a = "1";
\``,
output: `
ruleTester.run({
valid: [
{
code: \`
const a = "1";
\`,
},
],
});
`,
output: [
wrap`\`
${CODE_INDENT}const a = "1";
${PARENT_INDENT}\``,
wrap`\`
${CODE_INDENT}const a = '1';
${PARENT_INDENT}\``,
],
errors: [
{
messageId: 'templateLiteralLastLineIndent',
Expand Down Expand Up @@ -555,7 +536,8 @@ ruleTester.run({
],
});
`,
output: `
output: [
`
ruleTester.run({
valid: [
{
Expand Down Expand Up @@ -589,6 +571,75 @@ foo
],
});
`,
`
ruleTester.run({
valid: [
{
code: 'foo;',
},
{
code: \`
foo
\`,
},
{
code: \`
foo
\`,
},
],
invalid: [
{
code: 'foo;',
},
{
code: \`
foo
\`,
},
{
code: \`
foo
\`,
},
],
});
`,
`
ruleTester.run({
valid: [
{
code: 'foo;',
},
{
code: \`
foo;
\`,
},
{
code: \`
foo
\`,
},
],
invalid: [
{
code: 'foo;',
},
{
code: \`
foo;
\`,
},
{
code: \`
foo
\`,
},
],
});
`,
],
errors: [
{
messageId: 'singleLineQuotes',
Expand Down
7 changes: 6 additions & 1 deletion packages/eslint-plugin/tests/rules/no-useless-template-expression.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,16 @@ declare const nested: string, interpolation: string;
\`le\${ \`ss\` }\`
}\`;
`,
output: `
output: [
`
\`use\${
\`less\`
}\`;
`,
`
\`useless\`;
`,
],
errors: [
{
messageId: 'noUselessTemplateExpression',
Expand Down
7 changes: 6 additions & 1 deletion packages/eslint-plugin/tests/rules/no-useless-template-literals.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,16 @@ declare const nested: string, interpolation: string;
\`le\${ \`ss\` }\`
}\`;
`,
output: `
output: [
`
\`use\${
\`less\`
}\`;
`,
`
\`useless\`;
`,
],
errors: [
{
messageId: 'noUselessTemplateExpression',
Expand Down
Loading