BlueGit

timfa bluegit

Files

bluegit / internal / server / merge_opts_test.go

merge_opts_test.go

feat: bewaar squash en bronbranch op een merge request
timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa · 3 weeks ago
Passed 0a53b47c History
merge_opts_test.go 10.2 KiB Download Raw
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/httptest"
8 "net/url"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/access"
14 "gitlab.com/Timfa/bluegit/internal/store"
15)
16
17func TestSourceDeleteSkip(t *testing.T) {
18 if got := sourceDeleteSkip(access.RoleDeveloper, "master", "topic", true, false); got != "" {
19 t.Fatalf("mag weg: %s", got)
20 }
21 cases := []struct {
22 role access.Role
23 def, name string
24 exists bool
25 protected bool
26 want string
27 }{
28 {access.RoleDeveloper, "master", "topic", false, false, "missing"},
29 {access.RoleDeveloper, "master", "", true, false, "missing"},
30 {access.RoleDeveloper, "master", "master", true, false, "default"},
31 {access.RoleMaintainer, "master", "topic", true, true, "protected"},
32 {access.RoleReporter, "master", "topic", true, false, "forbidden"},
33 }
34 for _, c := range cases {
35 if got := sourceDeleteSkip(c.role, c.def, c.name, c.exists, c.protected); got != c.want {
36 t.Fatalf("%+v gaf %s", c, got)
37 }
38 }
39}
40
41func TestMergeFormDeletesSource(t *testing.T) {
42 srv, ts, st := mergeFixServer(t)
43 var bodies [][]byte
44 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
45 tim := loginClient(t, ts)
46 token := mintToken(t, tim, ts)
47 work := pushPair(t, ts, token, "weg", "alpha\n", "beta\n")
48 page := read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
49 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, "Delete source branch after merge") {
50 t.Fatalf("bronbranch staat niet standaard aan:\n%s", page)
51 }
52 if !strings.Contains(page, `name="squash" value="1">`) || !strings.Contains(page, "Squash commits") || strings.Contains(page, `name="squash" value="1" checked`) {
53 t.Fatalf("squash staat niet standaard uit:\n%s", page)
54 }
55 if !strings.Contains(page, `name="squash_commit_message">verder</textarea>`) {
56 t.Fatalf("squashbericht is niet de titel:\n%s", page)
57 }
58 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
59 "csrf": {csrfOf(t, page)}, "title": {"Bewaar"}, "source": {"topic"}, "target": {"master"},
60 }))
61 ctx := context.Background()
62 repo, err := st.RepoByPath(ctx, "tim", "weg")
63 if err != nil {
64 t.Fatal(err)
65 }
66 kept, err := st.MergeRequestByNumber(ctx, repo.ID, 1)
67 if err != nil || kept.RemoveSourceBranch || kept.Squash {
68 t.Fatalf("ontbrekend vakje hoort uit: %+v %v", kept, err)
69 }
70 _ = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/1/close", url.Values{"csrf": {csrfOf(t, page)}}))
71
72 page = read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
73 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
74 "csrf": {csrfOf(t, page)}, "title": {"Weg ermee"}, "source": {"topic"}, "target": {"master"},
75 "remove_source_branch": {"1"}, "squash_commit_message": {"later"},
76 }))
77 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, ">later</textarea>") {
78 t.Fatalf("mergeformulier:\n%s", page)
79 }
80 if _, err := st.CreateWebhook(ctx, store.Webhook{
81 ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",
82 URLTemplate: "https://example.test/hook", Events: []string{"push"},
83 }); err != nil {
84 t.Fatal(err)
85 }
86 bodies = nil
87 merged := read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/2/merge", url.Values{
88 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
89 }))
90 if !strings.Contains(merged, "Merged and deleted branch topic.") {
91 t.Fatalf("feedback:\n%s", merged)
92 }
93 git(t, work, "fetch", "--prune", "origin")
94 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
95 t.Fatal("bronbranch bestaat nog")
96 }
97 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
98 if len(parents) != 3 {
99 t.Fatalf("gewone merge hoort twee ouders te hebben: %v", parents)
100 }
101 push := decodeKind(t, bodies, "push")
102 if push["ref"] != "refs/heads/topic" || push["after"] != strings.Repeat("0", 40) || push["before"] == strings.Repeat("0", 40) {
103 t.Fatalf("verwijder-webhook %s", mustJSON(t, push))
104 }
105}
106
107func TestMergeKeepsProtectedAndDefault(t *testing.T) {
108 _, ts, st := mergeFixServer(t)
109 tim := loginClient(t, ts)
110 token := mintToken(t, tim, ts)
111 work := pushPair(t, ts, token, "slot", "alpha\n", "beta\n")
112 ctx := context.Background()
113 repo, err := st.RepoByPath(ctx, "tim", "slot")
114 if err != nil {
115 t.Fatal(err)
116 }
117 if err := st.AddProtected(ctx, repo.ID, "topic"); err != nil {
118 t.Fatal(err)
119 }
120 page := read(t, mustGet(t, tim, ts.URL+"/tim/slot/-/merge-requests/new?source=topic&target=master"))
121 page = read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests", url.Values{
122 "csrf": {csrfOf(t, page)}, "title": {"Beschermd"}, "source": {"topic"}, "target": {"master"},
123 "remove_source_branch": {"1"},
124 }))
125 kept := read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests/1/merge", url.Values{
126 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
127 }))
128 if !strings.Contains(kept, "Branch topic stays because it is protected.") {
129 t.Fatalf("beschermd:\n%s", kept)
130 }
131 git(t, work, "fetch", "origin")
132 if mustGit(t, work, "rev-parse", "--verify", "refs/remotes/origin/topic") == "" {
133 t.Fatal("beschermde branch weg")
134 }
135
136 defWork := pushPair(t, ts, token, "omlaag", "alpha\n", "beta\n")
137 git(t, defWork, "checkout", "master")
138 writeFile(t, filepath.Join(defWork, "extra.txt"), "extra\n")
139 git(t, defWork, "add", "extra.txt")
140 git(t, defWork, "commit", "-m", "op master")
141 git(t, defWork, "push", "origin", "master")
142 page = read(t, mustGet(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/new?source=master&target=topic"))
143 page = read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests", url.Values{
144 "csrf": {csrfOf(t, page)}, "title": {"Standaard"}, "source": {"master"}, "target": {"topic"},
145 "remove_source_branch": {"1"},
146 }))
147 stayed := read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/1/merge", url.Values{
148 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
149 }))
150 if !strings.Contains(stayed, "Branch master stays because it is the default branch.") {
151 t.Fatalf("standaard:\n%s", stayed)
152 }
153 git(t, defWork, "fetch", "origin")
154 if mustGit(t, defWork, "rev-parse", "--verify", "refs/remotes/origin/master") == "" {
155 t.Fatal("standaardbranch weg")
156 }
157}
158
159func TestMergeOptionsAPI(t *testing.T) {
160 _, ts, st := mergeFixServer(t)
161 tim := loginClient(t, ts)
162 token := mintToken(t, tim, ts)
163 work := pushPair(t, ts, token, "apiopt", "alpha\n", "beta\n")
164 writeFile(t, filepath.Join(work, "more.txt"), "meer\n")
165 git(t, work, "add", "more.txt")
166 git(t, work, "commit", "-m", "tweede")
167 git(t, work, "push", "origin", "topic")
168
169 spec := apiCall(t, ts, http.MethodGet, "/api/v1/openapi.json", token, "")
170 if !strings.Contains(spec, `"remove_source_branch"`) || !strings.Contains(spec, `"squash"`) || !strings.Contains(spec, "squash_commit_message") {
171 t.Fatalf("openapi mist de velden: %s", spec)
172 }
173 created := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
174 `{"title":"Standaard","source_branch":"topic","target_branch":"master"}`))
175 if created["remove_source_branch"] != true || created["squash"] != false || created["squash_commit_message"] != "" {
176 t.Fatalf("api-standaard %s", mustJSON(t, created))
177 }
178 updated := decodeBody(t, apiCall(t, ts, http.MethodPut, "/api/v1/projects/tim/apiopt/merge_requests/1", token,
179 `{"title":"Standaard","remove_source_branch":false,"squash":true,"squash_commit_message":"bewaard"}`))
180 if updated["remove_source_branch"] != false || updated["squash"] != true || updated["squash_commit_message"] != "bewaard" {
181 t.Fatalf("put %s", mustJSON(t, updated))
182 }
183 second := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
184 `{"title":"Squash mij","source_branch":"topic","target_branch":"master","remove_source_branch":false,"squash":true,"squash_commit_message":"eerste tekst"}`))
185 if second["iid"] != float64(2) || second["squash"] != true || second["remove_source_branch"] != false {
186 t.Fatalf("tweede %s", mustJSON(t, second))
187 }
188 merged := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests/2/merge", token,
189 `{"remove_source_branch":true,"squash":true,"squash_commit_message":"een bericht\n\ntweede regel"}`))
190 if merged["state"] != "merged" || merged["source_branch_removed"] != true || merged["source_branch_skip"] != "" {
191 t.Fatalf("merge %s", mustJSON(t, merged))
192 }
193 git(t, work, "fetch", "--prune", "origin")
194 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
195 t.Fatal("api liet de bronbranch staan")
196 }
197 msg := strings.TrimSpace(mustGit(t, work, "log", "-1", "--format=%B", "origin/master"))
198 if msg != "een bericht\n\ntweede regel" {
199 t.Fatalf("squashbericht %q", msg)
200 }
201 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
202 if len(parents) != 2 {
203 t.Fatalf("squash hoort geen merge-commit te zijn: %v", parents)
204 }
205 ctx := context.Background()
206 repo, err := st.RepoByPath(ctx, "tim", "apiopt")
207 if err != nil {
208 t.Fatal(err)
209 }
210 stored, err := st.MergeRequestByNumber(ctx, repo.ID, 2)
211 if err != nil || !stored.Squash || !stored.RemoveSourceBranch || stored.SquashMessage != "een bericht\n\ntweede regel" {
212 t.Fatalf("bewaard na merge %+v %v", stored, err)
213 }
214}
215
216func apiCall(t *testing.T, ts *httptest.Server, method, path, token, body string) string {
217 t.Helper()
218 var rdr *strings.Reader
219 if body != "" {
220 rdr = strings.NewReader(body)
221 }
222 var req *http.Request
223 var err error
224 if rdr == nil {
225 req, err = http.NewRequest(method, ts.URL+path, nil)
226 } else {
227 req, err = http.NewRequest(method, ts.URL+path, rdr)
228 }
229 if err != nil {
230 t.Fatal(err)
231 }
232 if body != "" {
233 req.Header.Set("Content-Type", "application/json")
234 }
235 if token != "" {
236 req.Header.Set("Authorization", "Bearer "+token)
237 }
238 res, err := http.DefaultClient.Do(req)
239 if err != nil {
240 t.Fatal(err)
241 }
242 raw := read(t, res)
243 if res.StatusCode < 200 || res.StatusCode >= 300 {
244 t.Fatalf("%s %s: %d %s", method, path, res.StatusCode, raw)
245 }
246 return raw
247}
248
249func decodeBody(t *testing.T, raw string) map[string]any {
250 t.Helper()
251 var doc map[string]any
252 if err := json.Unmarshal([]byte(raw), &doc); err != nil {
253 t.Fatalf("json %v %s", err, raw)
254 }
255 return doc
256}