From 4160f1830c8d775f599a2e93de1392f9081b417d Mon Sep 17 00:00:00 2001
From: Ross Rosales <ross.erosales@gmail.com>
Date: Wed, 29 Jun 2022 00:09:12 -0500
Subject: [PATCH] added test cases issue #2318

---
 tests/lib/rules/jsx-indent.js                 | 131 ++++++++++++-
 .../lib/rules/jsx-one-expression-per-line.js  | 180 ++++++++++++++++++
 2 files changed, 310 insertions(+), 1 deletion(-)

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
index ce4733d8fa..c43e7791ce 100644
--- a/tests/lib/rules/jsx-indent.js
+++ b/tests/lib/rules/jsx-indent.js
@@ -45,7 +45,7 @@ ruleTester.run('jsx-indent', rule, {
     {
       code: `
         <App>
-        </App>
+        </App> 
       `,
     },
     {
@@ -3001,6 +3001,135 @@ const Component = () => (
         },
       ],
     },
+    {
+      code: `
+        const IndexPage = () => (
+          <h1>
+        {"Hi people"}
+        <button/>
+        </h1>
+        );
+      `,
+      output: `
+        const IndexPage = () => (
+          <h1>
+            {"Hi people"}
+            <button/>
+          </h1>
+        );
+      `,
+      options:[2],
+      errors: [
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 12,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 12,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 10,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+      ],
+    },
+    // Would be nice to handle in one pass, but multipass works fine.
+    {
+      code: `
+        const IndexPage = () => (
+          <h1>
+        Hi people
+        <button/>
+        </h1>
+        );
+      `,
+
+      output: `
+        const IndexPage = () => (
+          <h1>
+            Hi people
+        <button/>
+          </h1>
+        );
+      `,
+      options:[2],
+      errors: [
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 12,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 12,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 10,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+      ],
+    },
+    {
+      code: `
+        const IndexPage = () => (
+          <h1>
+            Hi people
+        <button/>
+          </h1>
+        );
+      `,
+
+      output: `
+        const IndexPage = () => (
+          <h1>
+            Hi people
+            <button/>
+          </h1>
+        );
+      `,
+      options:[2],
+      errors: [
+        {
+          messageId: 'wrongIndent',
+          data: {
+            needed: 12,
+            type: 'space',
+            characters: 'characters',
+            gotten: 8,
+          },
+        },
+      ],
+    },
     semver.satisfies(eslintVersion, '> 4') ? {
       code: `
         import React from 'react';
diff --git a/tests/lib/rules/jsx-one-expression-per-line.js b/tests/lib/rules/jsx-one-expression-per-line.js
index a8ba820d02..e83c2b101f 100644
--- a/tests/lib/rules/jsx-one-expression-per-line.js
+++ b/tests/lib/rules/jsx-one-expression-per-line.js
@@ -1389,5 +1389,185 @@ a
       ],
       parserOptions,
     },
+    {
+    // TODO: handle in a single pass
+      code: `
+        const IndexPage = () => (
+          <h1>{"Hi people"}<button/></h1>
+        );
+      `,
+      output: `
+        const IndexPage = () => (
+          <h1>
+{"Hi people"}<button/></h1>
+        );
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: '{"Hi people"}' },
+        },
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'button' },
+        },
+      ],
+      parserOptions,
+    },
+    {
+      code: `
+        const IndexPage = () => (
+          <h1>
+{"Hi people"}<button/></h1>
+        );
+      `,
+      output: `
+        const IndexPage = () => (
+          <h1>
+{"Hi people"}
+<button/>
+</h1>
+        );
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'button' },
+        },
+      ],
+      parserOptions,
+    },
+    // TODO: handle in a single pass (see above)
+    {
+      code: `
+        <Layout>
+        <p>Welcome to your new Gatsby site.</p>
+        <p>Now go build something great.</p>
+        <h1>Hi people<button/></h1>
+        </Layout>
+      `,
+      output: `
+        <Layout>
+        <p>
+Welcome to your new Gatsby site.
+</p>
+        <p>
+Now go build something great.
+</p>
+        <h1>
+Hi people<button/></h1>
+        </Layout>
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Welcome to your new Gatsby site.' },
+        },
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Now go build something great.' },
+        },
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Hi people' },
+        },
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'button' },
+        },
+      ],
+      parserOptions,
+    },
+    {
+      code: `
+        <Layout>
+        <p>
+Welcome to your new Gatsby site.
+</p>
+        <p>
+Now go build something great.
+</p>
+        <h1>
+Hi people<button/></h1>
+        </Layout>
+      `,
+      output: `
+        <Layout>
+        <p>
+Welcome to your new Gatsby site.
+</p>
+        <p>
+Now go build something great.
+</p>
+        <h1>
+Hi people
+<button/>
+</h1>
+        </Layout>
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'button' },
+        },
+      ],
+      parserOptions,
+    },
+    // TODO: handle in a single pass
+    {
+      code: `
+        <Layout>
+          <div style={{ maxWidth: \`300px\`, marginBottom: \`1.45rem\` }}>
+            <Image />
+          </div><Link to="/page-2/">Go to page 2</Link>
+        </Layout>
+      `,
+      output: `
+        <Layout>
+          <div style={{ maxWidth: \`300px\`, marginBottom: \`1.45rem\` }}>
+            <Image />
+          </div>
+<Link to="/page-2/">Go to page 2</Link>
+        </Layout>
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Link' },
+        },
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Go to page 2' },
+        },
+      ],
+      parserOptions,
+    },
+    {
+      code: `
+        <Layout>
+          <div style={{ maxWidth: \`300px\`, marginBottom: \`1.45rem\` }}>
+            <Image />
+          </div>
+<Link to="/page-2/">Go to page 2</Link>
+        </Layout>
+      `,
+      output: `
+        <Layout>
+          <div style={{ maxWidth: \`300px\`, marginBottom: \`1.45rem\` }}>
+            <Image />
+          </div>
+<Link to="/page-2/">
+Go to page 2
+</Link>2
+        </Layout>
+      `,
+      errors: [
+        {
+          messageId: 'moveToNewLine',
+          data: { descriptor: 'Go to page 2' },
+        },
+      ],
+      parserOptions,
+    },
   ]),
 });