Formatting fix?
This commit is contained in:
@@ -166,7 +166,7 @@ func TestDeployWikiReportsLiveExecutionProgress(t *testing.T) {
|
||||
if err := saveDeployManifest(manifestPath, wikiDeployManifest{
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"feat:renamed": {Hash: computeManagedHash(renamePage), Title: "Old Renamed", TopicTitle: "Old Renamed", Namespace: "feat", TID: 7, PID: 70, CID: 5},
|
||||
"feat:renamed": {Hash: computeManagedHash(renamePage), Title: "Old Renamed", TopicTitle: "Old Renamed", Namespace: "feat", SourceContentSynced: true, TID: 7, PID: 70, CID: 5},
|
||||
"feat:updated": {Hash: computeManagedHash(oldUpdate), Title: "Updated", TopicTitle: "Updated", Namespace: "feat", TID: 8, PID: 80, CID: 5},
|
||||
},
|
||||
}); err != nil {
|
||||
@@ -676,9 +676,10 @@ func TestDeployWikiCreatesNodeBBTopicAndWritesManifest(t *testing.T) {
|
||||
}
|
||||
createCalls++
|
||||
var req struct {
|
||||
CID int `json:"cid"`
|
||||
Title string `json:"title"`
|
||||
Content string `json:"content"`
|
||||
CID int `json:"cid"`
|
||||
Title string `json:"title"`
|
||||
Content string `json:"content"`
|
||||
SourceContent string `json:"sourceContent"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
t.Fatalf("decode create request: %v", err)
|
||||
@@ -686,6 +687,9 @@ func TestDeployWikiCreatesNodeBBTopicAndWritesManifest(t *testing.T) {
|
||||
if req.CID != 5 || req.Title != "Athletics" || req.Content != generated {
|
||||
t.Fatalf("unexpected create request: %#v", req)
|
||||
}
|
||||
if req.SourceContent != generated {
|
||||
t.Fatalf("expected create request sourceContent to match generated HTML, got %q", req.SourceContent)
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(w).Encode(map[string]any{
|
||||
"response": map[string]any{
|
||||
@@ -719,6 +723,109 @@ func TestDeployWikiCreatesNodeBBTopicAndWritesManifest(t *testing.T) {
|
||||
if entry.TID != 11 || entry.PID != 42 || entry.CID != 5 || entry.Hash != computeManagedHash(generated) {
|
||||
t.Fatalf("unexpected manifest entry: %#v", entry)
|
||||
}
|
||||
if !entry.SourceContentSynced {
|
||||
t.Fatalf("expected created manifest entry to record sourceContent sync")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseNodeBBPostPrefersSourceContentForWikiHTML(t *testing.T) {
|
||||
post := parseNodeBBPost(map[string]any{
|
||||
"response": map[string]any{
|
||||
"pid": 42,
|
||||
"tid": 7,
|
||||
"content": "<p>Rendered as text</p>",
|
||||
"sourceContent": "<p>Stored source HTML</p>",
|
||||
},
|
||||
})
|
||||
if post.Content != "<p>Stored source HTML</p>" {
|
||||
t.Fatalf("expected sourceContent to be canonical deploy content, got %#v", post)
|
||||
}
|
||||
if post.SourceContent != "<p>Stored source HTML</p>" {
|
||||
t.Fatalf("expected sourceContent field to be preserved, got %#v", post)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeployWikiRepairsManifestedPageMissingSourceContentSync(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
sourceDir := filepath.Join(root, "pages")
|
||||
if err := os.MkdirAll(filepath.Join(sourceDir, "skills"), 0755); err != nil {
|
||||
t.Fatalf("create source dir: %v", err)
|
||||
}
|
||||
generated := `<!-- sow-topdata-wiki:page=skills:athletics -->
|
||||
<!-- sow-topdata-wiki:managed:start hash="sha256:local" -->
|
||||
<p>Ability: Strength.</p>
|
||||
<table><tbody><tr><th>Key Ability</th><td>STR</td></tr></tbody></table>
|
||||
<!-- sow-topdata-wiki:managed:end -->
|
||||
`
|
||||
if err := os.WriteFile(filepath.Join(sourceDir, "skills", "Athletics.html"), []byte(generated), 0644); err != nil {
|
||||
t.Fatalf("write source page: %v", err)
|
||||
}
|
||||
manifestPath := filepath.Join(root, "deploy-manifest.json")
|
||||
if err := saveDeployManifest(manifestPath, wikiDeployManifest{
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"skills:athletics": {
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Athletics",
|
||||
TopicTitle: "Athletics",
|
||||
Namespace: "skills",
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 3,
|
||||
},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatalf("write deploy manifest: %v", err)
|
||||
}
|
||||
|
||||
updateCalls := 0
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch {
|
||||
case r.Method == http.MethodGet && r.URL.Path == "/api/v3/posts/42":
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"pid": 42, "tid": 7, "content": generated}})
|
||||
case r.Method == http.MethodPut && r.URL.Path == "/api/v3/plugins/westgate-wiki/edit-lock":
|
||||
respondWikiEditLock(t, w, r, 7, "source-sync-lock")
|
||||
case r.Method == http.MethodPut && r.URL.Path == "/api/v3/posts/42":
|
||||
updateCalls++
|
||||
var req struct {
|
||||
Content string `json:"content"`
|
||||
SourceContent string `json:"sourceContent"`
|
||||
WikiEditLockToken string `json:"wikiEditLockToken"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
t.Fatalf("decode update request: %v", err)
|
||||
}
|
||||
if req.WikiEditLockToken != "source-sync-lock" {
|
||||
t.Fatalf("expected update to include wiki edit lock token, got %q", req.WikiEditLockToken)
|
||||
}
|
||||
if req.Content != generated || req.SourceContent != generated {
|
||||
t.Fatalf("expected repair update to write content and sourceContent, got %#v", req)
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"pid": 42, "tid": 7}})
|
||||
default:
|
||||
t.Fatalf("unexpected request %s %s", r.Method, r.URL.String())
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
result, err := DeployWikiWithOptions(&project.Project{}, DeployWikiOptions{
|
||||
SourceDir: sourceDir,
|
||||
Endpoint: server.URL,
|
||||
Token: "nodebb-token",
|
||||
ManifestPath: manifestPath,
|
||||
}, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("DeployWikiWithOptions sourceContent repair failed: %v", err)
|
||||
}
|
||||
if result.Updated != 1 || result.Skipped != 0 || updateCalls != 1 {
|
||||
t.Fatalf("expected one sourceContent repair update, result=%#v updateCalls=%d", result, updateCalls)
|
||||
}
|
||||
entry := loadDeployManifest(manifestPath).Pages["skills:athletics"]
|
||||
if !entry.SourceContentSynced {
|
||||
t.Fatalf("expected repair deploy to record sourceContent sync, got %#v", entry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeManagedContentPreservesUserTopAndBottomSections(t *testing.T) {
|
||||
@@ -897,7 +1004,7 @@ func TestDeployWikiRenamesExistingPrefixedTopicWhenTitleIsLongEnough(t *testing.
|
||||
if err := saveDeployManifest(manifestPath, wikiDeployManifest{
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"itemtypes:belt": {Hash: computeManagedHash(generated), Title: "Belt", Namespace: "itemtypes", TID: 7, PID: 42, CID: 5},
|
||||
"itemtypes:belt": {Hash: computeManagedHash(generated), Title: "Belt", Namespace: "itemtypes", SourceContentSynced: true, TID: 7, PID: 42, CID: 5},
|
||||
},
|
||||
}); err != nil {
|
||||
t.Fatalf("write deploy manifest: %v", err)
|
||||
@@ -975,13 +1082,14 @@ func TestDeployWikiRenamesManagedTopicWhenGeneratedTitleChanges(t *testing.T) {
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"feat:weapon:focus:dwaxe": {
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Weapon Focus (Dwaxe)",
|
||||
TopicTitle: "Weapon Focus (Dwaxe)",
|
||||
Namespace: "feat",
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Weapon Focus (Dwaxe)",
|
||||
TopicTitle: "Weapon Focus (Dwaxe)",
|
||||
Namespace: "feat",
|
||||
SourceContentSynced: true,
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
},
|
||||
},
|
||||
}); err != nil {
|
||||
@@ -1067,13 +1175,14 @@ func TestDeployWikiDoesNotRenameHeadinglessPageToPageIDFallback(t *testing.T) {
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"spells:acid_fog": {
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Acid Fog",
|
||||
TopicTitle: "Acid Fog",
|
||||
Namespace: "spells",
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Acid Fog",
|
||||
TopicTitle: "Acid Fog",
|
||||
Namespace: "spells",
|
||||
SourceContentSynced: true,
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
},
|
||||
},
|
||||
}); err != nil {
|
||||
@@ -1127,13 +1236,14 @@ func TestDeployWikiRenamesBrokenHeadinglessFallbackTitleBackToPageIndexTitle(t *
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"spells:acid_fog": {
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Acid_fog",
|
||||
TopicTitle: "Acid_fog",
|
||||
Namespace: "spells",
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Acid_fog",
|
||||
TopicTitle: "Acid_fog",
|
||||
Namespace: "spells",
|
||||
SourceContentSynced: true,
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 5,
|
||||
},
|
||||
},
|
||||
}); err != nil {
|
||||
@@ -2148,12 +2258,13 @@ func TestDeployWikiPurgeDoesNotTargetCurrentGeneratedPages(t *testing.T) {
|
||||
Version: "nodebb-v1",
|
||||
Pages: map[string]wikiDeployManifestPage{
|
||||
"skills:athletics": {
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Athletics",
|
||||
Namespace: "skills",
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 3,
|
||||
Hash: computeManagedHash(generated),
|
||||
Title: "Athletics",
|
||||
Namespace: "skills",
|
||||
SourceContentSynced: true,
|
||||
TID: 7,
|
||||
PID: 42,
|
||||
CID: 3,
|
||||
},
|
||||
},
|
||||
}); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user