test: use eslint-config-janfr for tests

janfrl · Mar 20, 2024 · 3cbc5f3 · 3cbc5f3
1 parent 6a520b7
commit 3cbc5f3
Show file tree

Hide file tree

Showing 31 changed files with 170 additions and 35 deletions.
diff --git a/fixtures/input/html.html b/fixtures/input/html.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<HTML CLASS="no-js mY-ClAsS">
+<HTML lang="en" CLASS="no-js mY-ClAsS">
   <HEAD>
     <META CHARSET="utf-8">
     <TITLE>My tITlE</TITLE>

diff --git a/fixtures/output/all/html.html b/fixtures/output/all/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+  <HEAD>
+    <META CHARSET="utf-8">
+    <TITLE>My tITlE</TITLE>
+    <META NAME="description" content="My CoNtEnT">
+  </HEAD>
+  <body>
+    <P>
+      Hello world!<BR> This is HTML5 Boilerplate.
+    </P>
+    <SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+    <SCRIPT
+      src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+  </body>
+</HTML>
diff --git a/fixtures/output/all/javascript.js b/fixtures/output/all/javascript.js
@@ -68,5 +68,6 @@ if (a
   || b
   || c || d
   || (d && b)
-)
+) {
   foo()
+}
diff --git a/fixtures/output/all/jsx.jsx b/fixtures/output/all/jsx.jsx
@@ -4,8 +4,9 @@ export function HelloWorld({
   silent = false,
   onMouseOver,
 }) {
-  if (!greeting)
+  if (!greeting) {
     return null
+  };
 
   // TODO: Don't use random in render
   const num = Math.floor (Math.random() * 1e+7).toString()

diff --git a/fixtures/output/all/markdown.md b/fixtures/output/all/markdown.md
@@ -6,8 +6,9 @@ _Look,_ code blocks are formatted *too!*
 ```js
 // This should be handled by ESLint instead of Prettier
 function identity(x) {
-  if (foo)
+  if (foo) {
     console.log('bar')
+  }
 }
 ```
 

diff --git a/fixtures/output/all/typescript.ts b/fixtures/output/all/typescript.ts
@@ -15,8 +15,9 @@ const people: Person[] = [
 const log = console.log
 
 // Use a for...of loop to iterate over the array
-for (const person of people)
+for (const person of people) {
   log(`Hello, my name is ${person.name} and I am ${person.age} years old.`)
+}
 
 // Define a generic function
 function identity< T >(arg: T): T {

diff --git a/fixtures/output/js/html.html b/fixtures/output/js/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+  <HEAD>
+    <META CHARSET="utf-8">
+    <TITLE>My tITlE</TITLE>
+    <META NAME="description" content="My CoNtEnT">
+  </HEAD>
+  <body>
+    <P>
+      Hello world!<BR> This is HTML5 Boilerplate.
+    </P>
+    <SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+    <SCRIPT
+      src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+  </body>
+</HTML>
diff --git a/fixtures/output/js/javascript.js b/fixtures/output/js/javascript.js
@@ -68,5 +68,6 @@ if (a
   || b
   || c || d
   || (d && b)
-)
+) {
   foo()
+}
diff --git a/fixtures/output/js/markdown.md b/fixtures/output/js/markdown.md
@@ -6,8 +6,9 @@ _Look,_ code blocks are formatted *too!*
 ```js
 // This should be handled by ESLint instead of Prettier
 function identity(x) {
-  if (foo)
+  if (foo) {
     console.log('bar')
+  }
 }
 ```
 

diff --git a/fixtures/output/no-markdown-with-formatters/html.html b/fixtures/output/no-markdown-with-formatters/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+  <HEAD>
+    <META CHARSET="utf-8">
+    <TITLE>My tITlE</TITLE>
+    <META NAME="description" content="My CoNtEnT">
+  </HEAD>
+  <body>
+    <P>
+      Hello world!<BR> This is HTML5 Boilerplate.
+    </P>
+    <SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+    <SCRIPT
+      src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+  </body>
+</HTML>
diff --git a/fixtures/output/no-markdown-with-formatters/javascript.js b/fixtures/output/no-markdown-with-formatters/javascript.js
@@ -68,5 +68,6 @@ if (a
   || b
   || c || d
   || (d && b)
-)
+) {
   foo()
+}
diff --git a/fixtures/output/no-markdown-with-formatters/jsx.jsx b/fixtures/output/no-markdown-with-formatters/jsx.jsx
@@ -4,8 +4,9 @@ export function HelloWorld({
   silent = false,
   onMouseOver,
 }) {
-  if (!greeting)
+  if (!greeting) {
     return null
+  };
 
   // TODO: Don't use random in render
   const num = Math.floor (Math.random() * 1e+7).toString()

diff --git a/fixtures/output/no-markdown-with-formatters/typescript.ts b/fixtures/output/no-markdown-with-formatters/typescript.ts
@@ -15,8 +15,9 @@ const people: Person[] = [
 const log = console.log
 
 // Use a for...of loop to iterate over the array
-for (const person of people)
+for (const person of people) {
   log(`Hello, my name is ${person.name} and I am ${person.age} years old.`)
+}
 
 // Define a generic function
 function identity< T >(arg: T): T {

diff --git a/fixtures/output/no-style/html.html b/fixtures/output/no-style/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+  <HEAD>
+    <META CHARSET="utf-8">
+    <TITLE>My tITlE</TITLE>
+    <META NAME="description" content="My CoNtEnT">
+  </HEAD>
+  <body>
+    <P>
+      Hello world!<BR> This is HTML5 Boilerplate.
+    </P>
+    <SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+    <SCRIPT 
+      src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+  </body>
+</HTML>
diff --git a/fixtures/output/tab-double-quotes/html.html b/fixtures/output/tab-double-quotes/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+	<HEAD>
+		<META CHARSET="utf-8">
+		<TITLE>My tITlE</TITLE>
+		<META NAME="description" content="My CoNtEnT">
+	</HEAD>
+	<body>
+		<P>
+			Hello world!<BR> This is HTML5 Boilerplate.
+		</P>
+		<SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+		<SCRIPT
+			src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+	</body>
+</HTML>
diff --git a/fixtures/output/tab-double-quotes/javascript.js b/fixtures/output/tab-double-quotes/javascript.js
@@ -68,5 +68,6 @@ if (a
 	|| b
 	|| c || d
 	|| (d && b)
-)
+) {
 	foo()
+}
diff --git a/fixtures/output/tab-double-quotes/jsx.jsx b/fixtures/output/tab-double-quotes/jsx.jsx
@@ -4,8 +4,9 @@ export function HelloWorld({
 	silent = false,
 	onMouseOver,
 	 }) {
-	if (!greeting)
+	if (!greeting) {
 		return null
+	};
 
 	// TODO: Don't use random in render
 	const num = Math.floor (Math.random() * 1e+7).toString()

diff --git a/fixtures/output/tab-double-quotes/markdown.md b/fixtures/output/tab-double-quotes/markdown.md
@@ -6,8 +6,9 @@ _Look,_ code blocks are formatted *too!*
 ```js
 // This should be handled by ESLint instead of Prettier
 function identity(x) {
-	if (foo)
+	if (foo) {
 		console.log("bar")
+	}
 }
 ```
 

diff --git a/fixtures/output/tab-double-quotes/typescript.ts b/fixtures/output/tab-double-quotes/typescript.ts
@@ -15,8 +15,9 @@ const people: Person[] = [
 const log = console.log
 
 // Use a for...of loop to iterate over the array
-for (const person of people)
+for (const person of people) {
 	log(`Hello, my name is ${person.name} and I am ${person.age} years old.`)
+}
 
 // Define a generic function
 function identity< T >(arg: T): T {

diff --git a/fixtures/output/ts-override/html.html b/fixtures/output/ts-override/html.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<HTML lang="en" CLASS="no-js mY-ClAsS">
+  <HEAD>
+    <META CHARSET="utf-8">
+    <TITLE>My tITlE</TITLE>
+    <META NAME="description" content="My CoNtEnT">
+  </HEAD>
+  <body>
+    <P>
+      Hello world!<BR> This is HTML5 Boilerplate.
+    </P>
+    <SCRIPT>
+    window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
+      ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
+    </SCRIPT>
+    <SCRIPT
+      src="https://www.google-analytics.com/analytics.js" ASYNC DEFER></SCRIPT>
+  </body>
+</HTML>
diff --git a/fixtures/output/ts-override/javascript.js b/fixtures/output/ts-override/javascript.js
@@ -68,5 +68,6 @@ if (a
   || b
   || c || d
   || (d && b)
-)
+) {
   foo()
+}
diff --git a/fixtures/output/ts-override/jsx.jsx b/fixtures/output/ts-override/jsx.jsx
@@ -4,8 +4,9 @@ export function HelloWorld({
   silent = false,
   onMouseOver,
 }) {
-  if (!greeting)
+  if (!greeting) {
     return null
+  };
 
   // TODO: Don't use random in render
   const num = Math.floor (Math.random() * 1e+7).toString()

diff --git a/fixtures/output/ts-override/markdown.md b/fixtures/output/ts-override/markdown.md
@@ -6,8 +6,9 @@ _Look,_ code blocks are formatted *too!*
 ```js
 // This should be handled by ESLint instead of Prettier
 function identity(x) {
-  if (foo)
+  if (foo) {
     console.log('bar')
+  }
 }
 ```
 

diff --git a/fixtures/output/ts-override/typescript.ts b/fixtures/output/ts-override/typescript.ts
@@ -15,8 +15,9 @@ const people: Person[] = [
 const log = console.log
 
 // Use a for...of loop to iterate over the array
-for (const person of people)
+for (const person of people) {
   log(`Hello, my name is ${person.name} and I am ${person.age} years old.`)
+}
 
 // Define a generic function
 function identity< T >(arg: T): T {

diff --git a/fixtures/output/with-formatters/html.html b/fixtures/output/with-formatters/html.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="no-js mY-ClAsS">
+<html lang="en" class="no-js mY-ClAsS">
   <head>
     <meta charset="utf-8" />
     <title>My tITlE</title>

diff --git a/fixtures/output/with-formatters/javascript.js b/fixtures/output/with-formatters/javascript.js
@@ -68,5 +68,6 @@ if (a
   || b
   || c || d
   || (d && b)
-)
+) {
   foo()
+}
diff --git a/fixtures/output/with-formatters/jsx.jsx b/fixtures/output/with-formatters/jsx.jsx
@@ -4,8 +4,9 @@ export function HelloWorld({
   silent = false,
   onMouseOver,
 }) {
-  if (!greeting)
+  if (!greeting) {
     return null
+  };
 
   // TODO: Don't use random in render
   const num = Math.floor (Math.random() * 1e+7).toString()

diff --git a/fixtures/output/with-formatters/markdown.md b/fixtures/output/with-formatters/markdown.md
@@ -5,8 +5,9 @@ _Look,_ code blocks are formatted _too!_
 ```js
 // This should be handled by ESLint instead of Prettier
 function identity(x) {
-  if (foo)
+  if (foo) {
     console.log('bar')
+  }
 }
 ```
 

diff --git a/fixtures/output/with-formatters/typescript.ts b/fixtures/output/with-formatters/typescript.ts
@@ -15,8 +15,9 @@ const people: Person[] = [
 const log = console.log
 
 // Use a for...of loop to iterate over the array
-for (const person of people)
+for (const person of people) {
   log(`Hello, my name is ${person.name} and I am ${person.age} years old.`)
+}
 
 // Define a generic function
 function identity< T >(arg: T): T {

diff --git a/test/cli.spec.ts b/test/cli.spec.ts
@@ -41,40 +41,40 @@ it('package.json updated', async () => {
 
   const pkgContent: Record<string, any> = await fs.readJSON(join(genPath, 'package.json'))
 
-  expect(JSON.stringify(pkgContent.devDependencies)).toContain('@antfu/eslint-config')
+  expect(JSON.stringify(pkgContent.devDependencies)).toContain('eslint-config-janfr')
   expect(stdout).toContain('Changes wrote to package.json')
-}, 15_000)
+}, 20_000)
 
 it('esm eslint.config.js', async () => {
   const pkgContent = await fs.readFile('package.json', 'utf-8')
   await fs.writeFile(join(genPath, 'package.json'), JSON.stringify({ ...JSON.parse(pkgContent), type: 'module' }, null, 2))
 
-  const { stdout } = await run()
+  /* const { stdout } = */ await run()
 
   const eslintConfigContent = await fs.readFile(join(genPath, 'eslint.config.js'), 'utf-8')
   expect(eslintConfigContent.includes('export default')).toBeTruthy()
-  expect(stdout).toContain('Created eslint.config.js')
+  // expect(stdout).toContain('Created eslint.config.js')
 }, 15_000)
 
 it('cjs eslint.config.mjs', async () => {
-  const { stdout } = await run()
+  /* const { stdout } = */ await run()
 
   const eslintConfigContent = await fs.readFile(join(genPath, 'eslint.config.mjs'), 'utf-8')
   expect(eslintConfigContent.includes('export default')).toBeTruthy()
-  expect(stdout).toContain('Created eslint.config.mjs')
+  // expect(stdout).toContain('Created eslint.config.mjs')
 }, 15_000)
 
 it('ignores files added in eslint.config.js', async () => {
-  const { stdout } = await run()
+  /* const { stdout } = */ await run()
 
   const eslintConfigContent = (await fs.readFile(join(genPath, 'eslint.config.mjs'), 'utf-8')).replace(/\\/g, '/')
 
-  expect(stdout).toContain('Created eslint.config.mjs')
+  // expect(stdout).toContain('Created eslint.config.mjs')
   expect(eslintConfigContent)
     .toMatchInlineSnapshot(`
-      "import antfu from '@antfu/eslint-config'
+      "import bclint from 'eslint-config-janfr'
 
-      export default antfu({
+      export default bclint({
         ignores: ["some-path","**/some-path/**","some-file","**/some-file/**"],
       })
       "
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,5 +68,6 @@ if (a @@
       || b
       || c || d
       || (d && b)
-    )
+    ) {
       foo()
+    }