Fix preflight adoption

2026-05-16 23:23:55 +02:00
parent 3dc69bb070
commit d34a640efe
3 changed files with 208 additions and 7 deletions
@@ -489,6 +489,109 @@ func TestDeployWikiUpdateAcquiresWestgateWikiEditLock(t *testing.T) {
 	}
 }

+func TestDeployWikiCreateCollisionAdoptsExistingNodeBBPage(t *testing.T) {
+	root := t.TempDir()
+	sourceDir := filepath.Join(root, "pages")
+	if err := os.MkdirAll(filepath.Join(sourceDir, "classes"), 0755); err != nil {
+		t.Fatalf("create source dir: %v", err)
+	}
+	generated := `<!-- sow-topdata-wiki:page=classes:bard -->
+<!-- sow-topdata-wiki:managed:start hash="sha256:local" -->
+<h1>Bard</h1>
+<p>Generated bard page</p>
+<!-- sow-topdata-wiki:managed:end -->
+`
+	if err := os.WriteFile(filepath.Join(sourceDir, "classes", "bard.html"), []byte(generated), 0644); err != nil {
+		t.Fatalf("write source page: %v", err)
+	}
+	old := `<!-- sow-topdata-wiki:page=classes:bard -->
+<!-- sow-topdata-wiki:managed:start hash="sha256:old" -->
+<h1>Bard</h1>
+<p>Old bard page</p>
+<!-- sow-topdata-wiki:managed:end -->
+`
+
+	createCalls := 0
+	var updated string
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && r.URL.Path == "/api/v3/plugins/westgate-wiki/namespace/9/pages" && r.URL.Query().Get("q") == "":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"pages": []any{}, "hasMore": false}})
+		case r.Method == http.MethodPost && r.URL.Path == "/api/v3/topics":
+			createCalls++
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"status": map[string]any{
+					"code":    "bad-request",
+					"message": "A wiki page with this URL already exists in this namespace. Rename the page before publishing.",
+				},
+				"response": map[string]any{},
+			})
+		case r.Method == http.MethodGet && r.URL.Path == "/api/v3/plugins/westgate-wiki/namespace/9/pages" && r.URL.Query().Get("q") == "bard":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"response": map[string]any{
+					"pages": []map[string]any{
+						{"tid": 77, "title": "Bard", "titleLeaf": "Bard", "slug": "77/bard", "wikiPath": "/wiki/classes/bard"},
+					},
+					"hasMore": false,
+				},
+			})
+		case r.Method == http.MethodGet && r.URL.Path == "/api/v3/topics/77":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"tid": 77, "mainPid": 88}})
+		case r.Method == http.MethodGet && r.URL.Path == "/api/v3/posts/88":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"pid": 88, "tid": 77, "content": old}})
+		case r.Method == http.MethodPut && r.URL.Path == "/api/v3/plugins/westgate-wiki/edit-lock":
+			respondWikiEditLock(t, w, r, 77, "collision-lock")
+		case r.Method == http.MethodPut && r.URL.Path == "/api/v3/posts/88":
+			var req struct {
+				Content           string `json:"content"`
+				WikiEditLockToken string `json:"wikiEditLockToken"`
+			}
+			if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+				t.Fatalf("decode update request: %v", err)
+			}
+			if req.WikiEditLockToken != "collision-lock" {
+				t.Fatalf("expected collision recovery update to include edit lock token, got %q", req.WikiEditLockToken)
+			}
+			updated = req.Content
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{"response": map[string]any{"pid": 88, "tid": 77}})
+		default:
+			t.Fatalf("unexpected request %s %s", r.Method, r.URL.String())
+		}
+	}))
+	defer server.Close()
+
+	manifestPath := filepath.Join(root, "deploy-manifest.json")
+	result, err := DeployWikiWithOptions(&project.Project{}, DeployWikiOptions{
+		SourceDir:    sourceDir,
+		Endpoint:     server.URL,
+		Token:        "nodebb-token",
+		ManifestPath: manifestPath,
+		CategoryIDs:  map[string]int{"classes": 9},
+		AllowCreates: true,
+	}, nil)
+	if err != nil {
+		t.Fatalf("DeployWikiWithOptions collision recovery failed: %v", err)
+	}
+	if result.Created != 0 || result.Updated != 1 || createCalls != 1 {
+		t.Fatalf("expected collision recovery to update existing page, result=%#v createCalls=%d", result, createCalls)
+	}
+	if !containsAll(updated, "<p>Generated bard page</p>") {
+		t.Fatalf("expected collision recovery to update adopted page:\n%s", updated)
+	}
+	manifest := loadDeployManifest(manifestPath)
+	entry := manifest.Pages["classes:bard"]
+	if entry.TID != 77 || entry.PID != 88 || entry.CID != 9 || entry.Hash != computeManagedHash(generated) {
+		t.Fatalf("unexpected adopted manifest entry: %#v", entry)
+	}
+}
+
 func TestDeployWikiReportsAndArchivesStalePages(t *testing.T) {
 	root := t.TempDir()
 	sourceDir := filepath.Join(root, "pages")