| 1 | package server |
| 2 | |
| 3 | import ( |
| 4 | "context" |
| 5 | "net/http" |
| 6 | "net/http/cookiejar" |
| 7 | "net/http/httptest" |
| 8 | "net/url" |
| 9 | "os/exec" |
| 10 | "path/filepath" |
| 11 | "strings" |
| 12 | "testing" |
| 13 | |
| 14 | "gitlab.com/Timfa/bluegit/internal/auth" |
| 15 | "gitlab.com/Timfa/bluegit/internal/config" |
| 16 | "gitlab.com/Timfa/bluegit/internal/store" |
| 17 | ) |
| 18 | |
| 19 | func TestForceMergeDespiteDraft(t *testing.T) { |
| 20 | srv, ts, st := mergeFixServer(t) |
| 21 | _ = srv |
| 22 | tim := loginClient(t, ts) |
| 23 | token := mintToken(t, tim, ts) |
| 24 | work := pushPair(t, ts, token, "forcey", "alpha\n", "beta\n") |
| 25 | page := read(t, mustGet(t, tim, ts.URL+"/tim/forcey/-/merge-requests/new?source=topic&target=master")) |
| 26 | page = read(t, mustPost(t, tim, ts.URL+"/tim/forcey/-/merge-requests", url.Values{ |
| 27 | "csrf": {csrfOf(t, page)}, "title": {"Concept"}, "description": {"Closes #9"}, |
| 28 | "source": {"topic"}, "target": {"master"}, "draft": {"1"}, |
| 29 | })) |
| 30 | if !strings.Contains(page, "This merge request is a draft.") || !strings.Contains(page, "Merge anyway") || !strings.Contains(page, "cannot be merged yet") { |
| 31 | t.Fatalf("reden ontbreekt:\n%s", page) |
| 32 | } |
| 33 | if strings.Contains(page, `>{{t "action.merge"}}`) { |
| 34 | t.Fatal("gewone mergeknop") |
| 35 | } |
| 36 | stayed := read(t, mustPost(t, tim, ts.URL+"/tim/forcey/-/merge-requests/1/merge", url.Values{ |
| 37 | "csrf": {csrfOf(t, page)}, "force": {"1"}, |
| 38 | })) |
| 39 | if !strings.Contains(stayed, "Confirm that you want to merge anyway.") { |
| 40 | t.Fatalf("zonder bevestiging:\n%s", stayed) |
| 41 | } |
| 42 | ctx := context.Background() |
| 43 | repo, err := st.RepoByPath(ctx, "tim", "forcey") |
| 44 | if err != nil { |
| 45 | t.Fatal(err) |
| 46 | } |
| 47 | mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1) |
| 48 | if err != nil || mr.Status != "open" { |
| 49 | t.Fatalf("status %s %v", mr.Status, err) |
| 50 | } |
| 51 | merged := read(t, mustPost(t, tim, ts.URL+"/tim/forcey/-/merge-requests/1/merge", url.Values{ |
| 52 | "csrf": {csrfOf(t, stayed)}, "force": {"1"}, "confirm_force": {"1"}, |
| 53 | })) |
| 54 | if !strings.Contains(merged, "merged anyway") || !strings.Contains(merged, "This merge request is a draft.") { |
| 55 | t.Fatalf("activiteit:\n%s", merged) |
| 56 | } |
| 57 | mr, err = st.MergeRequestByNumber(ctx, repo.ID, 1) |
| 58 | if err != nil || mr.Status != "merged" { |
| 59 | t.Fatalf("na toch mergen: %s %v", mr.Status, err) |
| 60 | } |
| 61 | _ = work |
| 62 | } |
| 63 | |
| 64 | func TestPushMarksMergeRequestMerged(t *testing.T) { |
| 65 | _, ts, st := mergeFixServer(t) |
| 66 | tim := loginClient(t, ts) |
| 67 | token := mintToken(t, tim, ts) |
| 68 | work := pushPair(t, ts, token, "hand", "een\n", "twee\n") |
| 69 | page := read(t, mustGet(t, tim, ts.URL+"/tim/hand/-/merge-requests/new?source=topic&target=master")) |
| 70 | page = read(t, mustPost(t, tim, ts.URL+"/tim/hand/-/merge-requests", url.Values{ |
| 71 | "csrf": {csrfOf(t, page)}, "title": {"Handmatig"}, "source": {"topic"}, "target": {"master"}, |
| 72 | })) |
| 73 | if !strings.Contains(page, ">open<") && !strings.Contains(page, "open") { |
| 74 | t.Fatalf("open:\n%s", page) |
| 75 | } |
| 76 | git(t, work, "checkout", "master") |
| 77 | git(t, work, "merge", "--no-edit", "topic") |
| 78 | git(t, work, "push", "origin", "master") |
| 79 | ctx := context.Background() |
| 80 | repo, err := st.RepoByPath(ctx, "tim", "hand") |
| 81 | if err != nil { |
| 82 | t.Fatal(err) |
| 83 | } |
| 84 | mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1) |
| 85 | if err != nil || mr.Status != "merged" { |
| 86 | t.Fatalf("push hoort de MR merged te zetten: %s %v", mr.Status, err) |
| 87 | } |
| 88 | shown := read(t, mustGet(t, tim, ts.URL+"/tim/hand/-/merge-requests/1")) |
| 89 | if !strings.Contains(shown, "merged this merge request") { |
| 90 | t.Fatalf("tijdlijn:\n%s", shown) |
| 91 | } |
| 92 | branches := read(t, mustGet(t, tim, ts.URL+"/tim/hand/-/branches")) |
| 93 | if strings.Contains(branches, "/-/merge-requests/1") { |
| 94 | t.Fatalf("gemergde MR hoort niet meer in de kolom:\n%s", branches) |
| 95 | } |
| 96 | } |
| 97 | |
| 98 | func TestMergeShowsConflict(t *testing.T) { |
| 99 | _, ts, _ := mergeFixServer(t) |
| 100 | tim := loginClient(t, ts) |
| 101 | token := mintToken(t, tim, ts) |
| 102 | work := pushPair(t, ts, token, "bots", "zelfde\n", "links\n") |
| 103 | git(t, work, "checkout", "master") |
| 104 | writeFile(t, filepath.Join(work, "hello.txt"), "rechts\n") |
| 105 | git(t, work, "add", "hello.txt") |
| 106 | git(t, work, "commit", "-m", "master wijzigt") |
| 107 | git(t, work, "push", "origin", "master") |
| 108 | page := read(t, mustGet(t, tim, ts.URL+"/tim/bots/-/merge-requests/new?source=topic&target=master")) |
| 109 | page = read(t, mustPost(t, tim, ts.URL+"/tim/bots/-/merge-requests", url.Values{ |
| 110 | "csrf": {csrfOf(t, page)}, "title": {"Bots"}, "source": {"topic"}, "target": {"master"}, |
| 111 | })) |
| 112 | if !strings.Contains(page, "The branches conflict.") || !strings.Contains(page, "Merge anyway") { |
| 113 | t.Fatalf("conflict:\n%s", page) |
| 114 | } |
| 115 | tried := read(t, mustPost(t, tim, ts.URL+"/tim/bots/-/merge-requests/1/merge", url.Values{ |
| 116 | "csrf": {csrfOf(t, page)}, "force": {"1"}, "confirm_force": {"1"}, |
| 117 | })) |
| 118 | if !strings.Contains(tried, "conflict") || !strings.Contains(tried, ">open<") && !strings.Contains(tried, "open") { |
| 119 | t.Fatalf("toch mergen bij een conflict:\n%s", tried) |
| 120 | } |
| 121 | } |
| 122 | |
| 123 | func mergeFixServer(t *testing.T) (*Server, *httptest.Server, *store.Store) { |
| 124 | t.Helper() |
| 125 | if _, err := exec.LookPath("git"); err != nil { |
| 126 | t.Skip("git ontbreekt") |
| 127 | } |
| 128 | storage := t.TempDir() |
| 129 | st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32()) |
| 130 | if err != nil { |
| 131 | t.Fatal(err) |
| 132 | } |
| 133 | t.Cleanup(func() { _ = st.Close() }) |
| 134 | cfg := config.Config{ |
| 135 | BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage, |
| 136 | Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"}, |
| 137 | Git: config.Git{Binary: "git", DefaultBranch: "master"}, |
| 138 | } |
| 139 | srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"} |
| 140 | ts := httptest.NewServer(srv.Handler()) |
| 141 | t.Cleanup(ts.Close) |
| 142 | return srv, ts, st |
| 143 | } |
| 144 | |
| 145 | func loginClient(t *testing.T, ts *httptest.Server) *http.Client { |
| 146 | t.Helper() |
| 147 | jar, _ := cookiejar.New(nil) |
| 148 | tim := &http.Client{Jar: jar} |
| 149 | read(t, mustGet(t, tim, ts.URL+"/login")) |
| 150 | return tim |
| 151 | } |
| 152 | |
| 153 | func mintToken(t *testing.T, tim *http.Client, ts *httptest.Server) string { |
| 154 | t.Helper() |
| 155 | page := read(t, mustGet(t, tim, ts.URL+"/settings")) |
| 156 | page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{ |
| 157 | "csrf": {csrfOf(t, page)}, "name": {"laptop"}, |
| 158 | })) |
| 159 | return between(page, `<p class="code">`, "</p>") |
| 160 | } |
| 161 | |
| 162 | func pushPair(t *testing.T, ts *httptest.Server, token, name, base, next string) string { |
| 163 | t.Helper() |
| 164 | page := read(t, mustGet(t, loginOwner(t, ts), ts.URL+"/new/repo")) |
| 165 | _ = page |
| 166 | tim := loginOwner(t, ts) |
| 167 | home := read(t, mustGet(t, tim, ts.URL+"/")) |
| 168 | _ = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{ |
| 169 | "csrf": {csrfOf(t, home)}, "name": {name}, "visibility": {"public"}, |
| 170 | })) |
| 171 | remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/" + name + ".git" |
| 172 | work := t.TempDir() |
| 173 | git(t, work, "init", "-b", "master") |
| 174 | git(t, work, "config", "user.email", "tim@users.git.timfalken.com") |
| 175 | git(t, work, "config", "user.name", "tim") |
| 176 | writeFile(t, filepath.Join(work, "hello.txt"), base) |
| 177 | git(t, work, "add", "hello.txt") |
| 178 | git(t, work, "commit", "-m", "start") |
| 179 | git(t, work, "remote", "add", "origin", remote) |
| 180 | git(t, work, "push", "-u", "origin", "master") |
| 181 | git(t, work, "checkout", "-b", "topic") |
| 182 | writeFile(t, filepath.Join(work, "hello.txt"), next) |
| 183 | git(t, work, "add", "hello.txt") |
| 184 | git(t, work, "commit", "-m", "verder") |
| 185 | git(t, work, "push", "-u", "origin", "topic") |
| 186 | return work |
| 187 | } |
| 188 | |
| 189 | func loginOwner(t *testing.T, ts *httptest.Server) *http.Client { |
| 190 | t.Helper() |
| 191 | return loginClient(t, ts) |
| 192 | } |