Separated tests for different formats

Author: matthewlipski

tests/src/unit/core/clipboard/copy/getCopyTestInstances.ts renamed to tests/src/unit/core/clipboard/copy/copyTestInstances.ts

@@ -14,12 +14,12 @@ import {
   getPosOfTextNode,
 } from "../clipboardTestUtil.js";
 
-export const getCopyTestInstances = (): TestInstance<
+export const copyTestInstancesHTML: TestInstance<
   CopyTestCase<TestBlockSchema, TestInlineContentSchema, TestStyleSchema>,
   TestBlockSchema,
   TestInlineContentSchema,
   TestStyleSchema
->[] => [
+>[] = [
   {
     testCase: {
       name: "multipleChildren",

tests/src/unit/core/clipboard/copy/runTests.test.ts

@@ -2,15 +2,15 @@ import { describe, it } from "vitest";
 
 import { setupTestEditor } from "../../setupTestEditor.js";
 import { testSchema } from "../../testSchema.js";
-import { getCopyTestInstances } from "./getCopyTestInstances.js";
+import { copyTestInstancesHTML } from "./copyTestInstances.js";
 
 // Tests for verifying content that gets put on the clipboard when copying
 // within the editor. Used broadly to ensure each block or set of blocks is correctly
 // converted into different types of clipboard data.
-describe("Copy tests", () => {
+describe("Copy tests (HTML)", () => {
   const getEditor = setupTestEditor(testSchema);
 
-  for (const { testCase, executeTest } of getCopyTestInstances()) {
+  for (const { testCase, executeTest } of copyTestInstancesHTML) {
     it(`${testCase.name}`, async () => {
       await executeTest(getEditor(), testCase);
     });

tests/src/unit/core/clipboard/copyPaste/getCopyPasteTestInstances.ts renamed to tests/src/unit/core/clipboard/copyPaste/copyPasteTestInstances.ts

@@ -10,12 +10,12 @@ import { testCopyPaste } from "../../../shared/clipboard/copyPaste/copyPasteTest
 import { TestInstance } from "../../../types.js";
 import { getPosOfTextNode } from "../clipboardTestUtil.js";
 
-export const getCopyPasteTestInstances = (): TestInstance<
+export const copyPasteTestInstances: TestInstance<
   CopyPasteTestCase<TestBlockSchema, TestInlineContentSchema, TestStyleSchema>,
   TestBlockSchema,
   TestInlineContentSchema,
   TestStyleSchema
->[] => [
+>[] = [
   {
     testCase: {
       name: "paragraphInCustomBlock",

tests/src/unit/core/clipboard/copyPaste/runTests.test.ts

@@ -2,14 +2,14 @@ import { describe, it } from "vitest";
 
 import { setupTestEditor } from "../../setupTestEditor.js";
 import { testSchema } from "../../testSchema.js";
-import { getCopyPasteTestInstances } from "./getCopyPasteTestInstances.js";
+import { copyPasteTestInstances } from "./copyPasteTestInstances.js";
 
 // Tests for verifying that copying and pasting content within the editor works
 // as expected. Used for specific cases where unexpected behaviour was noticed.
 describe("Copy/paste tests", () => {
   const getEditor = setupTestEditor(testSchema);
 
-  for (const { testCase, executeTest } of getCopyPasteTestInstances()) {
+  for (const { testCase, executeTest } of copyPasteTestInstances) {
     it(`${testCase.name}`, async () => {
       await executeTest(getEditor(), testCase);
     });

tests/src/unit/core/clipboard/copyPasteEquality/getCopyPasteEqualityTestInstances.ts renamed to tests/src/unit/core/clipboard/copyPasteEquality/copyPasteEqualityTestInstances.ts

@@ -6,9 +6,9 @@ import {
 import { CopyPasteEqualityTestCase } from "../../../shared/clipboard/copyPasteEquality/copyPasteEqualityTestCase.js";
 import { testCopyPasteEquality } from "../../../shared/clipboard/copyPasteEquality/copyPasteEqualityTestExecutors.js";
 import { TestInstance } from "../../../types.js";
-import { getCopyTestInstances } from "../copy/getCopyTestInstances.js";
+import { copyTestInstancesHTML } from "../copy/copyTestInstances.js";
 
-export const getCopyPasteEqualityTestInstances = (): TestInstance<
+export const copyPasteEqualityTestInstances: TestInstance<
   CopyPasteEqualityTestCase<
     TestBlockSchema,
     TestInlineContentSchema,
@@ -17,12 +17,11 @@ export const getCopyPasteEqualityTestInstances = (): TestInstance<
   TestBlockSchema,
   TestInlineContentSchema,
   TestStyleSchema
->[] =>
-  getCopyTestInstances().map(({ testCase }) => ({
-    testCase: {
-      name: testCase.name,
-      document: testCase.document,
-      getCopyAndPasteSelection: testCase.getCopySelection,
-    },
-    executeTest: testCopyPasteEquality,
-  }));
+>[] = copyTestInstancesHTML.map(({ testCase }) => ({
+  testCase: {
+    name: testCase.name,
+    document: testCase.document,
+    getCopyAndPasteSelection: testCase.getCopySelection,
+  },
+  executeTest: testCopyPasteEquality,
+}));

tests/src/unit/core/clipboard/copyPasteEquality/runTests.test.ts

@@ -2,15 +2,15 @@ import { describe, it } from "vitest";
 
 import { setupTestEditor } from "../../setupTestEditor.js";
 import { testSchema } from "../../testSchema.js";
-import { getCopyPasteEqualityTestInstances } from "./getCopyPasteEqualityTestInstances.js";
+import { copyPasteEqualityTestInstances } from "./copyPasteEqualityTestInstances.js";
 
 // Tests for verifying that copying and pasting content in place within the
 // editor results in the same document as the original. Used broadly to ensure
 // that converting to and from clipboard data does not result in any data loss.
 describe("Copy/paste equality tests", () => {
   const getEditor = setupTestEditor(testSchema);
 
-  for (const { testCase, executeTest } of getCopyPasteEqualityTestInstances()) {
+  for (const { testCase, executeTest } of copyPasteEqualityTestInstances) {
     it(`${testCase.name}`, async () => {
       await executeTest(getEditor(), testCase);
     });

tests/src/unit/core/clipboard/paste/getPasteTestInstances.ts renamed to tests/src/unit/core/clipboard/paste/pasteTestInstances.ts

@@ -13,12 +13,12 @@ import {
 import { TestInstance } from "../../../types.js";
 import { getPosOfTextNode } from "../clipboardTestUtil.js";
 
-export const getPasteTestInstances = (): TestInstance<
+export const pasteTestInstancesHTML: TestInstance<
   PasteTestCase<TestBlockSchema, TestInlineContentSchema, TestStyleSchema>,
   TestBlockSchema,
   TestInlineContentSchema,
   TestStyleSchema
->[] => [
+>[] = [
   {
     testCase: {
       name: "pasteEndOfParagraph",
@@ -37,24 +37,6 @@ export const getPasteTestInstances = (): TestInstance<
     },
     executeTest: testPasteHTML,
   },
-  {
-    testCase: {
-      name: "pasteEndOfParagraphText",
-      content: `Paragraph`,
-      document: [
-        {
-          type: "paragraph",
-          content: "Paragraph 1",
-        },
-      ],
-      getPasteSelection: (doc) => {
-        const startPos = getPosOfTextNode(doc, "Paragraph 1", true);
-
-        return TextSelection.create(doc, startPos);
-      },
-    },
-    executeTest: testPasteMarkdown,
-  },
   {
     testCase: {
       name: "pasteImage",
@@ -156,3 +138,29 @@ export const getPasteTestInstances = (): TestInstance<
     executeTest: testPasteHTML,
   },
 ];
+
+export const pasteTestInstancesMarkdown: TestInstance<
+  PasteTestCase<TestBlockSchema, TestInlineContentSchema, TestStyleSchema>,
+  TestBlockSchema,
+  TestInlineContentSchema,
+  TestStyleSchema
+>[] = [
+  {
+    testCase: {
+      name: "pasteEndOfParagraphText",
+      content: `Paragraph`,
+      document: [
+        {
+          type: "paragraph",
+          content: "Paragraph 1",
+        },
+      ],
+      getPasteSelection: (doc) => {
+        const startPos = getPosOfTextNode(doc, "Paragraph 1", true);
+
+        return TextSelection.create(doc, startPos);
+      },
+    },
+    executeTest: testPasteMarkdown,
+  },
+];

tests/src/unit/core/clipboard/paste/runTests.test.ts

@@ -2,16 +2,29 @@ import { describe, it } from "vitest";
 
 import { setupTestEditor } from "../../setupTestEditor.js";
 import { testSchema } from "../../testSchema.js";
-import { getPasteTestInstances } from "./getPasteTestInstances.js";
+import {
+  pasteTestInstancesHTML,
+  pasteTestInstancesMarkdown,
+} from "./pasteTestInstances.js";
 
 // Tests for verifying that clipboard data gets pasted into the editor properly.
 // Used for specific cases for when content from outside the editor is pasted
 // into it. This includes content from other editors, as well as content from
 // the web that has produced bugs in the past.
-describe("Paste tests", () => {
+describe("Paste tests (HTML)", () => {
   const getEditor = setupTestEditor(testSchema);
 
-  for (const { testCase, executeTest } of getPasteTestInstances()) {
+  for (const { testCase, executeTest } of pasteTestInstancesHTML) {
+    it(`${testCase.name}`, async () => {
+      await executeTest(getEditor(), testCase);
+    });
+  }
+});
+
+describe("Paste tests (Markdown)", () => {
+  const getEditor = setupTestEditor(testSchema);
+
+  for (const { testCase, executeTest } of pasteTestInstancesMarkdown) {
     it(`${testCase.name}`, async () => {
       await executeTest(getEditor(), testCase);
     });