Skip to content
This repository has been archived by the owner on Jan 2, 2025. It is now read-only.

Merge functionality #1699

Merged
merged 9 commits into from
May 21, 2024
Merged
Prev Previous commit
Next Next commit
fix(daemon): take drafts from the same document
juligasa authored and burdiyan committed May 21, 2024
commit 5c265d923621a50c2da94f2bbee82f688f52e189
5 changes: 3 additions & 2 deletions backend/daemon/api/documents/v1alpha/documents_test.go
Original file line number Diff line number Diff line change
@@ -575,7 +575,7 @@ func TestMerge(t *testing.T) {
})
require.NoError(t, err)

draft, err = api.CreateDraft(ctx, &documents.CreateDraftRequest{})
draft, err = api.CreateDraft(ctx, &documents.CreateDraftRequest{ExistingDocumentId: pub1.Document.Id})
require.NoError(t, err)
updated2 := updateDraft(ctx, t, api, draft.Id, []*documents.DocumentChange{
{Op: &documents.DocumentChange_SetTitle{SetTitle: "Second Doc"}},
@@ -591,8 +591,9 @@ func TestMerge(t *testing.T) {
DocumentId: updated2.Id,
})
require.NoError(t, err)

require.Equal(t, pub1.Document.Id, pub2.Document.Id)
mergedPub, err := api.MergeChanges(ctx, &documents.MergeChangesRequest{
Id: pub1.Document.Id,
Versions: []string{pub1.Version, pub2.Version},
})
require.NoError(t, err)