more tests

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -651,14 +651,11 @@ export const convertForSecondPass = (
       const qmdFileName = change?.fileName?.replace(".xml", ".qmd") ?? "";
       const updateId = fileMetadataTable[qmdFileName]?.id;
 
-      console.log("change.fileName", change.fileName);
-      console.log("change.ancestors", change.ancestors);
-      console.log("fileMetadataTable", fileMetadataTable);
       if (updateId) {
         const convertedUpdate = buildContentUpdate(
           updateId,
           change.title,
-          change.body, //TODO convert links
+          change.body,
           change.fileName ?? "",
           "",
           ContentStatusEnum.current,
@@ -676,7 +673,15 @@ export const convertForSecondPass = (
   };
 
   const changesAsUpdates = spaceChanges.reduce(toUpdatesReducer, []);
-  return changesAsUpdates;
+
+  const updateLinkResults = updateLinks(
+    fileMetadataTable,
+    changesAsUpdates,
+    server,
+    parent
+  );
+
+  return updateLinkResults.pass1Changes;
 };
 
 export const updateImagePaths = (body: ContentBody): ContentBody => {

src/publish/confluence/confluence.ts

@@ -622,7 +622,6 @@ async function publish(
     trace("fileMetadata", fileMetadata);
 
     let metadataByFilename = buildFileToMetaTable(existingSite);
-    console.log("metadataByFilename", metadataByFilename);
 
     trace("metadataByFilename", metadataByFilename);
 
@@ -642,7 +641,7 @@ async function publish(
 
     changeList = pass1Changes;
 
-    trace("changelist", changeList);
+    trace("changelist Pass 1", changeList);
 
     let pathsToId: Record<string, string> = {}; // build from existing site
 
@@ -710,24 +709,20 @@ async function publish(
 
     if (pass2Changes.length) {
       //PASS #2 to update links to newly created pages
-      console.log("do pass 2 link updates");
+
+      trace("changelist Pass 2", pass2Changes);
 
       // reload the existing site
       existingSite = await fetchExistingSite(parentId);
       metadataByFilename = buildFileToMetaTable(existingSite);
 
-      console.log("metadataByFilename", metadataByFilename);
-      console.log("pass2Changes", pass2Changes);
-
       const linkUpdateChanges: ConfluenceSpaceChange[] = convertForSecondPass(
         metadataByFilename,
         pass2Changes,
         server,
         parent
       );
 
-      console.log("linkUpdateChanges", linkUpdateChanges);
-
       for (let currentChange of linkUpdateChanges) {
         await doChange(currentChange);
       }

tests/unit/confluence.test.ts

@@ -59,8 +59,8 @@ import {
   Space,
 } from "../../src/publish/confluence/api/types.ts";
 
-const RUN_ALL_TESTS = false;
-const FOCUS_TEST = true;
+const RUN_ALL_TESTS = true;
+const FOCUS_TEST = false;
 
 const xtest = (
   name: string,
@@ -3639,6 +3639,23 @@ const runConvertForSecondPass = () => {
     fileName: "release-planning.xml",
   };
 
+  const CREATE_LINKS_ONE: ContentCreate = {
+    contentChangeType: ContentChangeType.create,
+    title: "Release Planning",
+    type: "page",
+    status: "current",
+    ancestors: [{ id: "19759105" }],
+    space: fakeSpace,
+    body: {
+      storage: {
+        value:
+          "<a href='no-replace.qmd'/>no</a> content content <a href='team.qmd'>team</a> content content <a href='zqmdzz.qmd'>team</a>",
+        representation: "storage",
+      },
+    },
+    fileName: "release-planning.xml",
+  };
+
   const UPDATE_LINKS_ONE_NESTED_DOT_SLASH: ContentUpdate = {
     contentChangeType: ContentChangeType.update,
     id: "43778049",
@@ -3755,11 +3772,43 @@ const runConvertForSecondPass = () => {
     check(expected, changes, fileMetadataTable);
   });
 
-  otest(suiteLabel("one_create_noLink_convert_to_update"), async () => {
+  test(suiteLabel("one_create_noLink_convert_to_update"), async () => {
     const changes: ConfluenceSpaceChange[] = [CREATE_NO_LINKS];
     const expected: ConfluenceSpaceChange[] = [UPDATE_NO_LINKS];
     check(expected, changes, fileMetadataTable);
   });
+
+  test(suiteLabel("one_update_link"), async () => {
+    const changes: ConfluenceSpaceChange[] = [UPDATE_LINKS_ONE];
+    const rootURL = "fake-server/wiki/spaces/QUARTOCONF/pages";
+    const expectedUpdate: ContentUpdate = {
+      ...UPDATE_LINKS_ONE,
+      body: {
+        storage: {
+          value: `<a href=\'no-replace.qmd\'/>no</a> content content <a href=\'fake-server/wiki/spaces/QUARTOCONF/pages/19857455/Team\'>team</a> content content <a href=\'zqmdzz.qmd\'>team</a>`,
+          representation: "storage",
+        },
+      },
+    };
+    const expected: ConfluenceSpaceChange[] = [expectedUpdate];
+    check(expected, changes, fileMetadataTable, "fake-server", FAKE_PARENT);
+  });
+
+  otest(suiteLabel("one_update_link_from_create"), async () => {
+    const changes: ConfluenceSpaceChange[] = [CREATE_LINKS_ONE];
+    const rootURL = "fake-server/wiki/spaces/QUARTOCONF/pages";
+    const expectedUpdate: ContentUpdate = {
+      ...UPDATE_LINKS_ONE,
+      body: {
+        storage: {
+          value: `<a href=\'no-replace.qmd\'/>no</a> content content <a href=\'fake-server/wiki/spaces/QUARTOCONF/pages/19857455/Team\'>team</a> content content <a href=\'zqmdzz.qmd\'>team</a>`,
+          representation: "storage",
+        },
+      },
+    };
+    const expected: ConfluenceSpaceChange[] = [expectedUpdate];
+    check(expected, changes, fileMetadataTable, "fake-server", FAKE_PARENT);
+  });
 };
 
 const runFindAttachments = () => {