OXYGENHUB
◆ v0.5.0 oxygenhub / crates / hub / tests / proposals.rs
37.4 KiB · Rust · last changed UI polish: keys, backups, wiki, editor, bookmarks, summaries, backdrops 21 days ago source blame history raw
1
//! Milestone 0.3 end to end: a proposal from a bookmark and from a fork,
2
//! an atom-anchored comment, a seal-backed approval, requirements and a
3
//! landing from the hub.
4
5
use axum::body::Body;
6
use axum::http::{header, Request, StatusCode};
7
use http_body_util::BodyExt;
8
use oxy_core::repo::Repo;
9
use oxygenhub::config::Config;
10
use oxygenhub::db;
11
use oxygenhub::repos::RepoName;
12
use oxygenhub::Shared;
13
use std::path::Path;
14
use tower::ServiceExt;
15
16
fn hermetic() {
17
    static ONCE: std::sync::Once = std::sync::Once::new();
18
    static DIR: std::sync::OnceLock<tempfile::TempDir> = std::sync::OnceLock::new();
19
    ONCE.call_once(|| {
20
        let d = tempfile::tempdir().unwrap();
21
        std::env::set_var("OXY_HOME", d.path());
22
        DIR.set(d).ok();
23
    });
24
}
25
26
fn write(root: &Path, rel: &str, content: &[u8]) {
27
    let p = root.join(rel);
28
    std::fs::create_dir_all(p.parent().unwrap()).unwrap();
29
    std::fs::write(p, content).unwrap();
30
}
31
32
struct Hub {
33
    app: Shared,
34
    base: String,
35
    _dir: tempfile::TempDir,
36
}
37
38
async fn hub() -> Hub {
39
    hermetic();
40
    let dir = tempfile::tempdir().unwrap();
41
    let mut config = Config::load(dir.path()).unwrap();
42
    config.auth.push_tokens = vec!["site".into()];
43
    config.registration.mode = "open".into();
44
    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
45
    let port = listener.local_addr().unwrap().port();
46
    config.server.base_url = format!("http://127.0.0.1:{port}");
47
    let app = oxygenhub::build(config).await.unwrap();
48
    let router = oxygenhub::router(app.clone());
49
    tokio::spawn(async move { axum::serve(listener, router).await.unwrap() });
50
    Hub { app, base: format!("http://127.0.0.1:{port}"), _dir: dir }
51
}
52
53
struct Res {
54
    status: StatusCode,
55
    body: String,
56
    cookie: Option<String>,
57
}
58
59
async fn send(app: &Shared, method: &str, path: &str, cookie: Option<&str>, form: Option<&str>, bearer: Option<&str>) -> Res {
60
    let mut req = Request::builder().method(method).uri(path);
61
    if let Some(c) = cookie {
62
        req = req.header(header::COOKIE, format!("oxyhub={c}"));
63
    }
64
    if let Some(b) = bearer {
65
        req = req.header(header::AUTHORIZATION, format!("Bearer {b}"));
66
    }
67
    let body = match form {
68
        Some(f) => {
69
            req = req.header(header::CONTENT_TYPE, "application/x-www-form-urlencoded");
70
            Body::from(f.to_string())
71
        }
72
        None => Body::empty(),
73
    };
74
    let res = oxygenhub::router(app.clone()).oneshot(req.body(body).unwrap()).await.unwrap();
75
    let status = res.status();
76
    let cookie = res
77
        .headers()
78
        .get(header::SET_COOKIE)
79
        .and_then(|v| v.to_str().ok())
80
        .and_then(|v| v.split(';').next())
81
        .and_then(|kv| kv.split_once('='))
82
        .map(|(_, v)| v.to_string());
83
    let bytes = res.into_body().collect().await.unwrap().to_bytes();
84
    Res { status, body: String::from_utf8_lossy(&bytes).into_owned(), cookie }
85
}
86
87
async fn get(app: &Shared, path: &str, cookie: Option<&str>) -> Res {
88
    send(app, "GET", path, cookie, None, None).await
89
}
90
91
async fn post(app: &Shared, path: &str, cookie: Option<&str>, form: &str) -> Res {
92
    send(app, "POST", path, cookie, Some(form), None).await
93
}
94
95
/// POST a proposal action and follow its redirect back to the page, as a
96
/// browser does (actions redirect so a reload never repeats them).
97
async fn act(app: &Shared, path: &str, cookie: Option<&str>, form: &str) -> Res {
98
    let mut req = Request::builder().method("POST").uri(path).header(header::CONTENT_TYPE, "application/x-www-form-urlencoded");
99
    if let Some(c) = cookie {
100
        req = req.header(header::COOKIE, format!("oxyhub={c}"));
101
    }
102
    let res = oxygenhub::router(app.clone()).oneshot(req.body(Body::from(form.to_string())).unwrap()).await.unwrap();
103
    assert_eq!(res.status(), StatusCode::SEE_OTHER, "{path} redirects back");
104
    let to = res.headers().get(header::LOCATION).and_then(|v| v.to_str().ok()).unwrap_or("").to_string();
105
    get(app, &to, cookie).await
106
}
107
108
async fn register(app: &Shared, user: &str) -> String {
109
    let r = post(app, "/register", None, &format!("username={user}&email={user}%40example.com&password=correct-horse-battery")).await;
110
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
111
    r.cookie.unwrap()
112
}
113
114
fn csrf_of(page: &str) -> String {
115
    let i = page.find("name=\"_csrf\" value=\"").expect("csrf field") + "name=\"_csrf\" value=\"".len();
116
    page[i..].split('"').next().unwrap().to_string()
117
}
118
119
#[tokio::test(flavor = "multi_thread")]
120
async fn propose_review_seal_and_land() {
121
    let h = hub().await;
122
    let app = &h.app;
123
    let andy = register(app, "andy").await;
124
    let bob = register(app, "bob").await;
125
126
    // A repository with main and a feature bookmark, pushed by Andy's client.
127
    let repo = RepoName::parse("andy/demo").unwrap();
128
    app.repos.create(&repo, None).unwrap();
129
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
130
    let work = tempfile::tempdir().unwrap();
131
    let mut client = Repo::init(work.path()).unwrap();
132
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
133
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
134
    client.config.set("remote.origin.token", "site").unwrap();
135
    client.config.set("core.sign", "change").unwrap();
136
    client.save_config().unwrap();
137
    write(work.path(), "a.txt", b"one\ntwo\n");
138
    write(work.path(), ".oxyowners", b"* @andy\n");
139
    client.snapshot("t").unwrap();
140
    let base = client.commit("base", &[]).unwrap();
141
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
142
    client.bookmark_create("feature", Some(&[base])).unwrap();
143
    client.bookmark_switch("feature", false).unwrap();
144
    write(work.path(), "a.txt", b"one\ntwo\nthree\n");
145
    client.snapshot("t").unwrap();
146
    let feat = client.commit("add three", &[]).unwrap();
147
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
148
149
    // The compare page offers the proposal to writers only (hub spec §6.3).
150
    let cmp = get(app, "/andy/demo/compare/main...feature", Some(&andy)).await;
151
    assert!(cmp.body.contains("href=\"/andy/demo/proposals/new?source=feature&#38;target=main\">Propose this"), "{}", cmp.body);
152
    assert!(!get(app, "/andy/demo/compare/main...feature", Some(&bob)).await.body.contains("Propose this"));
153
    assert!(
154
        !get(app, "/andy/demo/compare/feature...main", Some(&andy)).await.body.contains("Propose this"),
155
        "nothing to propose the other way"
156
    );
157
158
    // Bob previews and opens a proposal feature → main.
159
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&bob)).await;
160
    assert_eq!(preview.status, StatusCode::OK);
161
    assert!(preview.body.contains("1 change") && preview.body.contains("add three"), "{}", preview.body);
162
    let csrf = csrf_of(&preview.body);
163
    let r =
164
        post(app, "/andy/demo/proposals/new", Some(&bob), &format!("_csrf={csrf}&title=Add+three&body=Please&target=main&source=feature"))
165
            .await;
166
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
167
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await;
168
    assert_eq!(page.status, StatusCode::OK);
169
    assert!(page.body.contains("Add three") && page.body.contains("1 change"), "{}", page.body);
170
    assert!(page.body.contains("Please"));
171
    assert!(get(app, "/andy/demo/proposals", None).await.body.contains("#1"));
172
    let cmp = get(app, "/andy/demo/compare/main...feature", Some(&andy)).await;
173
    assert!(cmp.body.contains("proposal #1 is open") && !cmp.body.contains("Propose this"), "the open proposal instead");
174
175
    // A comment anchored to line 3 of a.txt lands in the thread on the files tab.
176
    let files = get(app, "/andy/demo/proposal/1?tab=files", Some(&bob)).await;
177
    assert!(files.body.contains("+three") || files.body.contains(">three<"), "diff shown: {}", files.body);
178
    let csrf_b = csrf_of(&files.body);
179
    let r = act(app, "/andy/demo/proposal/1/comment", Some(&bob), &format!("_csrf={csrf_b}&body=nice+line&path=a.txt&line=3")).await;
180
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
181
    assert!(r.body.contains("class=\"thread\"") && r.body.contains("nice line"), "anchored comment placed: {}", r.body);
182
    let c = db::proposals::comments(&app.db, 1).await.unwrap();
183
    assert_eq!(c[0].anchor_change, feat.to_hex(), "anchored to the atom the feature change introduced");
184
185
    // Requirements: one sealed approval and code owners.
186
    let settings = get(app, "/andy/demo/settings", Some(&andy)).await;
187
    let csrf_a = csrf_of(&settings.body);
188
    assert_eq!(
189
        post(app, "/andy/demo/settings/requirements", Some(&andy), &format!("_csrf={csrf_a}&required_approvals=1&require_owners=1"))
190
            .await
191
            .status,
192
        StatusCode::OK
193
    );
194
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
195
    assert!(page.body.contains("0 of 1 required sealed approvals"), "{}", page.body);
196
    assert!(page.body.contains("code owners still to approve: andy"), "{}", page.body);
197
198
    // Bob cannot approve his own; Andy approves, which is pending until sealed.
199
    let csrf_b = csrf_of(&get(app, "/andy/demo/proposal/1", Some(&bob)).await.body);
200
    let r = act(app, "/andy/demo/proposal/1/review", Some(&bob), &format!("_csrf={csrf_b}&verdict=approve")).await;
201
    assert!(r.body.contains("cannot approve your own"), "{}", r.body);
202
    let r = act(app, "/andy/demo/proposal/1/review", Some(&andy), &format!("_csrf={csrf_a}&verdict=approve&body=LGTM")).await;
203
    assert!(r.body.contains("seal pending"), "{}", r.body);
204
    assert!(r.body.contains("oxy seal --proposal"));
205
206
    // Andy links his key, seals the proposal's change and pushes the seal: the approval counts.
207
    let key = client.config.author_key.unwrap();
208
    let identity = client.identity(&key).unwrap();
209
    db::accounts::link_identity(
210
        &app.db,
211
        db::accounts::account_by_name(&app.db, "andy").await.unwrap().unwrap().id,
212
        &key.to_hex(),
213
        &identity.name,
214
        &identity.email,
215
        &identity.encode(),
216
    )
217
    .await
218
    .unwrap();
219
    let seal = client.seal(&[feat]).unwrap();
220
    client.push_seals("origin", &[seal]).unwrap();
221
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
222
    assert!(page.body.contains("approved and sealed"), "{}", page.body);
223
    assert!(page.body.contains("ready to land"), "{}", page.body);
224
    // The API agrees, and names the projected heads for `oxy proposal land`.
225
    let api = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1", None, None, Some("site")).await;
226
    assert_eq!(api.status, StatusCode::OK);
227
    let v: serde_json::Value = serde_json::from_str(&api.body).unwrap();
228
    assert_eq!(v["landable"], true, "{}", api.body);
229
    assert_eq!(v["approvals"][0]["sealed"], true);
230
    assert_eq!(v["projected_heads"][0], feat.to_hex());
231
    assert_eq!(v["changes"][0]["hash"], feat.to_hex());
232
233
    // Land from the hub (no policy): main moves to the projected heads.
234
    let csrf_a = csrf_of(&page.body);
235
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={csrf_a}")).await;
236
    assert!(r.body.contains("Landed."), "{}", r.body);
237
    let heads = app.repos.read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().find(|b| b.name == "main").unwrap().heads)).await.unwrap();
238
    assert_eq!(heads, vec![feat]);
239
    assert!(get(app, "/andy/demo/proposals?state=landed", None).await.body.contains("#1"));
240
    assert!(get(app, "/andy/demo/pushes", None).await.body.contains("landed #1 (web)"));
241
    // Landed, it still shows what it landed, by whom and how, and nothing holds it back.
242
    let api = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1", None, None, Some("site")).await;
243
    let v: serde_json::Value = serde_json::from_str(&api.body).unwrap();
244
    assert_eq!(v["state"], "landed", "{}", api.body);
245
    assert_eq!(v["changes"][0]["hash"], feat.to_hex(), "{}", api.body);
246
    assert_eq!(v["blockers"], serde_json::json!([]), "{}", api.body);
247
    assert_eq!(v["landed"]["by"], "andy");
248
    assert_eq!(v["landed"]["via"], "web");
249
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
250
    assert!(page.body.contains("by <a href=\"/andy\">andy</a>, web"), "{}", page.body);
251
    // oxygenhub#86: a landed card offering to delete the source bookmark,
252
    // the description edited in place from its ··· menu or the pencil.
253
    assert!(page.body.contains("Proposal landed") && page.body.contains("value=\"feature\""), "{}", page.body);
254
    assert!(page.body.contains("can be safely deleted"), "{}", page.body);
255
    assert!(page.body.contains("class=\"head-pencil\"") && page.body.contains("id=\"edit\"") && page.body.contains("Copy link"));
256
    assert!(!page.body.contains("Edit title, target and description</summary>"), "no disclosure at the bottom");
257
    let csrf = csrf_of(&page.body);
258
    let r = post(app, "/andy/demo/bookmarks/delete", Some(&andy), &format!("_csrf={csrf}&bookmark=feature")).await;
259
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
260
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
261
    assert!(page.body.contains("Proposal landed") && !page.body.contains("can be safely deleted"), "gone, so not offered again");
262
    // Lists by state through the API.
263
    let list = |q: &'static str| async move {
264
        let r = send(app, "GET", &format!("/api/v1/repos/andy/demo/proposals{q}"), None, None, Some("site")).await;
265
        serde_json::from_str::<serde_json::Value>(&r.body).unwrap().as_array().unwrap().len()
266
    };
267
    assert_eq!(list("").await, 0, "open ones only by default");
268
    assert_eq!(list("?state=landed").await, 1);
269
    assert_eq!(list("?state=all").await, 1);
270
271
    // A proposal from a fork: a copy of the repository with the same id.
272
    let fork = RepoName::parse("bob/demo").unwrap();
273
    app.repos.create(&fork, Some(client.id().unwrap())).unwrap();
274
    db::repos::create(&app.db, "bob", "demo", "fork", hub_api::Visibility::Public).await.unwrap();
275
    db::accounts::set_collaborator(
276
        &app.db,
277
        db::repos::get(&app.db, "bob", "demo").await.unwrap().unwrap().id,
278
        Some(db::accounts::account_by_name(&app.db, "bob").await.unwrap().unwrap().id),
279
        None,
280
        "admin",
281
    )
282
    .await
283
    .unwrap();
284
    client.config.set("remote.fork.url", &format!("{}/bob/demo", h.base)).unwrap();
285
    client.config.set("remote.fork.token", "site").unwrap();
286
    client.bookmark_switch("main", false).unwrap();
287
    client.fetch("origin").unwrap();
288
    client.bookmark_set("main", &[feat]).unwrap();
289
    client.bookmark_create("fix", Some(&[feat])).unwrap();
290
    client.bookmark_switch("fix", false).unwrap();
291
    write(work.path(), "b.txt", b"b\n");
292
    client.snapshot("t").unwrap();
293
    let fix = client.commit("add b", &[]).unwrap();
294
    assert!(client.push_bookmark("fork", "fix", false).unwrap().iter().all(|r| r.ok));
295
    let preview = get(app, "/andy/demo/proposals/new?source=bob/demo:fix&target=main", Some(&bob)).await;
296
    assert!(preview.body.contains("add b"), "fork preview: {}", preview.body);
297
    let csrf = csrf_of(&preview.body);
298
    let r =
299
        post(app, "/andy/demo/proposals/new", Some(&bob), &format!("_csrf={csrf}&title=From+fork&target=main&source=bob/demo:fix")).await;
300
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
301
    let page = get(app, "/andy/demo/proposal/2?tab=changes", Some(&andy)).await;
302
    assert!(page.body.contains("add b"), "{}", page.body);
303
    assert!(
304
        app.repos.read(&repo, move |r, _| Ok(r.store().has(&fix))).await.unwrap(),
305
        "the fork's change was copied into the target's store"
306
    );
307
    // Closing and reopening.
308
    let csrf_b = csrf_of(&get(app, "/andy/demo/proposal/2", Some(&bob)).await.body);
309
    let r = act(app, "/andy/demo/proposal/2/state", Some(&bob), &format!("_csrf={csrf_b}&action=close")).await;
310
    assert!(r.body.contains(">closed<"), "{}", r.body);
311
    let r = act(app, "/andy/demo/proposal/2/state", Some(&bob), &format!("_csrf={csrf_b}&action=reopen")).await;
312
    assert!(r.body.contains(">open<"), "{}", r.body);
313
}
314
315
/// A stand-in chat-completions endpoint that answers with a fixed review
316
/// and keeps the body of each call.
317
async fn mock_assistant(answer: &'static str) -> (String, std::sync::Arc<std::sync::Mutex<Vec<String>>>) {
318
    use std::sync::{Arc, Mutex};
319
    let seen: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
320
    let s2 = seen.clone();
321
    let router = axum::Router::new().route(
322
        "/v1/chat/completions",
323
        axum::routing::post(move |headers: axum::http::HeaderMap, body: String| {
324
            let s2 = s2.clone();
325
            async move {
326
                let auth = headers.get("authorization").and_then(|v| v.to_str().ok()).unwrap_or("").to_string();
327
                s2.lock().unwrap().push(format!("{auth} {body}"));
328
                axum::Json(serde_json::json!({ "choices": [{ "message": { "role": "assistant", "content": answer } }] }))
329
            }
330
        }),
331
    );
332
    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
333
    let port = listener.local_addr().unwrap().port();
334
    tokio::spawn(async move { axum::serve(listener, router).await.unwrap() });
335
    (format!("http://127.0.0.1:{port}/v1/chat/completions"), seen)
336
}
337
338
#[tokio::test(flavor = "multi_thread")]
339
async fn an_assistant_reviews_a_proposal_via_the_person_who_asked() {
340
    let h = hub().await;
341
    let app = &h.app;
342
    let andy = register(app, "andy").await;
343
    let bob = register(app, "bob").await;
344
    let repo = RepoName::parse("andy/demo").unwrap();
345
    app.repos.create(&repo, None).unwrap();
346
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
347
    let work = tempfile::tempdir().unwrap();
348
    let mut client = Repo::init(work.path()).unwrap();
349
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
350
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
351
    client.config.set("remote.origin.token", "site").unwrap();
352
    client.config.set("core.sign", "change").unwrap();
353
    client.save_config().unwrap();
354
    write(work.path(), "a.txt", b"one\ntwo\n");
355
    client.snapshot("t").unwrap();
356
    let base = client.commit("base", &[]).unwrap();
357
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
358
    client.bookmark_create("feature", Some(&[base])).unwrap();
359
    client.bookmark_switch("feature", false).unwrap();
360
    write(work.path(), "a.txt", b"one\ntwo\nthree\n");
361
    client.snapshot("t").unwrap();
362
    client.commit("add three", &[]).unwrap();
363
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
364
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&bob)).await;
365
    let csrf_b = csrf_of(&preview.body);
366
    let r = post(
367
        app,
368
        "/andy/demo/proposals/new",
369
        Some(&bob),
370
        &format!("_csrf={csrf_b}&title=Add+three&body=Please&target=main&source=feature"),
371
    )
372
    .await;
373
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
374
375
    // Nothing to ask until the site has an assistant.
376
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
377
    assert!(!page.contains("Ask Claude"), "{page}");
378
    let (endpoint, seen) = mock_assistant("**Summary.** Adds a third line.\n\n- a.txt line 3: fine.").await;
379
    let admin = get(app, "/admin", Some(&andy)).await.body;
380
    let csrf_a = csrf_of(&admin);
381
    let ep = endpoint.replace(':', "%3A").replace('/', "%2F");
382
    let r = post(
383
        app,
384
        "/admin/assistants",
385
        Some(&andy),
386
        &format!("_csrf={csrf_a}&action=add&name=Claude&endpoint={ep}&api=chat-completions&model=claude-opus-5-5&token=sk-test&enabled=1"),
387
    )
388
    .await;
389
    assert!(r.body.contains("Claude added and answered"), "{}", r.body);
390
    seen.lock().unwrap().clear();
391
    let r =
392
        post(app, "/admin/assistants", Some(&andy), &format!("_csrf={csrf_a}&action=prompt&prompt=Review+for+correctness+first.")).await;
393
    assert!(r.body.contains("Prompt saved."), "{}", r.body);
394
395
    // Claude drafts a description for a proposal not yet opened, and for
396
    // the open one; neither is saved until the person says so.
397
    let page = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&bob)).await.body;
398
    assert!(page.contains("Draft with Claude"), "{page}");
399
    let r = post(
400
        app,
401
        "/andy/demo/proposals/new/draft",
402
        Some(&bob),
403
        &format!("_csrf={}&title=Add+three&body=&target=main&source=feature&assistant=Claude", csrf_of(&page)),
404
    )
405
    .await;
406
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
407
    assert!(r.body.contains("rows=\"8\">**Summary.** Adds a third line.") && r.body.contains("value=\"Add three\""), "{}", r.body);
408
    {
409
        let calls = seen.lock().unwrap();
410
        assert_eq!(calls.len(), 1);
411
        assert!(
412
            calls[0].contains("drafting the description") && calls[0].contains("+three") && calls[0].contains("Proposal: Add three"),
413
            "{}",
414
            calls[0]
415
        );
416
    }
417
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
418
    assert!(page.contains("Draft with Claude"), "{page}");
419
    let r =
420
        post(app, "/andy/demo/proposal/1/draft", Some(&bob), &format!("_csrf={}&assistant=Claude&title=Add+three", csrf_of(&page))).await;
421
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
422
    assert!(
423
        r.body.contains("tl-editform open") && r.body.contains("aria-label=\"Description (Markdown)\">**Summary.** Adds a third line."),
424
        "{}",
425
        r.body
426
    );
427
    assert!(r.body.contains("nothing is saved until you update"), "{}", r.body);
428
    assert_eq!(db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().body, "Please", "the description is untouched");
429
    assert_eq!(seen.lock().unwrap().len(), 2);
430
    seen.lock().unwrap().clear();
431
432
    // Andy approves; then Bob, the author, asks Claude.
433
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
434
    let r = post(app, "/andy/demo/proposal/1/review", Some(&andy), &format!("_csrf={}&verdict=approve&body=good", csrf_of(&page))).await;
435
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
436
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
437
    assert!(page.contains("Ask Claude"), "{page}");
438
    let r = act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=claude", csrf_of(&page))).await;
439
    assert!(r.body.contains("Asked Claude to review"), "{}", r.body);
440
    let mut reviews = vec![];
441
    for _ in 0..100 {
442
        reviews = db::proposals::reviews(&app.db, 1).await.unwrap();
443
        if reviews.iter().any(|r| r.via == "Claude") {
444
            break;
445
        }
446
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
447
    }
448
    let claude = reviews.iter().find(|r| r.via == "Claude").expect("the assistant's review arrived");
449
    assert_eq!((claude.author.as_str(), claude.verdict.as_str()), ("bob", "comment"));
450
    assert!(claude.body.contains("Adds a third line"));
451
    {
452
        let calls = seen.lock().unwrap();
453
        assert_eq!(calls.len(), 1);
454
        let c = &calls[0];
455
        assert!(c.starts_with("Bearer sk-test "), "{c}");
456
        assert!(
457
            c.contains("You are Claude") && c.contains("Review for correctness first."),
458
            "the system prompt and the site's prompt: {c}"
459
        );
460
        assert!(c.contains("Proposal #1: Add three") && c.contains("a.txt (modified)") && c.contains("+three"), "the context: {c}");
461
    }
462
    // Shown as Bob via Claude, with the event; Andy's approval still counts.
463
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
464
    assert!(
465
        page.contains("<strong>bob</strong></a> <span class=\"mute\" aria-hidden=\"true\">↳</span> <span class=\"tag\"")
466
            && page.contains("<strong>Claude</strong>"),
467
        "{page}"
468
    );
469
    assert!(page.contains("asked Claude to review") && page.contains("Adds a third line"), "{page}");
470
    let p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
471
    let loaded = oxygenhub::web::proposals::load(app, &repo, p).await.unwrap();
472
    let v = oxygenhub::web::proposals::verdict(app, &loaded, 1).await.unwrap();
473
    assert!(v.approvals.iter().any(|a| a.account == "andy"), "{:?}", v.approvals.iter().map(|a| &a.account).collect::<Vec<_>>());
474
    // Bob asks Claude for a summary (#190): it comes as a comment via Claude.
475
    assert!(page.contains("Summarise with Claude"), "{page}");
476
    seen.lock().unwrap().clear();
477
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
478
    let r =
479
        act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=Claude&task=summary", csrf_of(&page))).await;
480
    assert!(r.body.contains("Asked Claude for a summary"), "{}", r.body);
481
    let mut comments = vec![];
482
    for _ in 0..100 {
483
        comments = db::proposals::comments(&app.db, 1).await.unwrap();
484
        if comments.iter().any(|c| c.via == "Claude") {
485
            break;
486
        }
487
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
488
    }
489
    let summary = comments.iter().find(|c| c.via == "Claude").expect("the assistant's summary arrived");
490
    assert_eq!(summary.author, "bob");
491
    assert!(summary.body.contains("Adds a third line"));
492
    {
493
        let calls = seen.lock().unwrap();
494
        assert_eq!(calls.len(), 1);
495
        let c = &calls[0];
496
        assert!(
497
            c.contains("called Oxygen")
498
                && c.contains("equivalent of a merge request or pull request")
499
                && c.contains("Please summarise the proposal"),
500
            "{c}"
501
        );
502
        assert!(c.contains("Review for correctness first.") && c.contains("+three"), "the site's prompt and the context: {c}");
503
    }
504
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
505
    assert!(page.contains("asked Claude for a summary") && page.contains("wrote this for bob"), "{page}");
506
    // The API lists the review via Claude and takes requests too.
507
    let r = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1/reviews", None, None, None).await;
508
    assert!(r.body.contains("\"via\":\"Claude\""), "{}", r.body);
509
    // Renaming the assistant renames it on the review and in the events.
510
    let admin = get(app, "/admin", Some(&andy)).await.body;
511
    let r = post(
512
        app,
513
        "/admin/assistants",
514
        Some(&andy),
515
        &format!(
516
            "_csrf={}&action=update&id={}&name=Claude+Code&endpoint={ep}&api=chat-completions&model=claude-opus-5-5&token=&enabled=1",
517
            csrf_of(&admin),
518
            oxygenhub::assistants::list(&app.db, oxygenhub::levels::Scope::Site).await.unwrap()[0].id
519
        ),
520
    )
521
    .await;
522
    assert!(r.body.contains("Claude Code updated."), "{}", r.body);
523
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
524
    assert!(page.contains("<strong>Claude Code</strong>") && page.contains("asked Claude Code to review"), "{page}");
525
    assert!(!page.contains("<strong>Claude</strong>"), "{page}");
526
    // A stranger cannot ask; an unknown assistant is refused.
527
    post(app, "/andy/demo/proposal/1/assistant", None, "_csrf=x&assistant=Claude").await;
528
    assert_eq!(seen.lock().unwrap().len(), 1, "no call for a stranger");
529
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
530
    let r = act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=HAL", csrf_of(&page))).await;
531
    assert!(r.body.contains("No assistant called HAL"), "{}", r.body);
532
}
533
534
/// #141: a proposal whose work reaches its target another way (a client's
535
/// `oxy proposal land`, as a trust policy needs, or a merge pushed by hand)
536
/// is marked landed by that push, not left open with nothing to land.
537
#[tokio::test(flavor = "multi_thread")]
538
async fn a_proposal_landed_by_a_push_is_marked_landed() {
539
    let h = hub().await;
540
    let app = &h.app;
541
    let andy = register(app, "andy").await;
542
    let repo = RepoName::parse("andy/demo").unwrap();
543
    app.repos.create(&repo, None).unwrap();
544
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
545
    let work = tempfile::tempdir().unwrap();
546
    let mut client = Repo::init(work.path()).unwrap();
547
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
548
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
549
    client.config.set("remote.origin.token", "site").unwrap();
550
    client.save_config().unwrap();
551
    write(work.path(), "a.txt", b"one\n");
552
    client.snapshot("t").unwrap();
553
    let base = client.commit("base", &[]).unwrap();
554
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
555
    client.bookmark_create("feature", Some(&[base])).unwrap();
556
    client.bookmark_switch("feature", false).unwrap();
557
    write(work.path(), "a.txt", b"one\ntwo\n");
558
    client.snapshot("t").unwrap();
559
    let feat = client.commit("add two", &[]).unwrap();
560
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
561
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
562
    let csrf = csrf_of(&preview.body);
563
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=Two&body=&target=main&source=feature")).await;
564
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
565
    assert_eq!(db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().state, "open");
566
567
    // The work goes onto main by a push, not by the Land button.
568
    client.bookmark_set("main", &[feat]).unwrap();
569
    assert!(client.push_bookmark("origin", "main", false).unwrap().iter().all(|r| r.ok));
570
    let mut p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
571
    for _ in 0..100 {
572
        if p.state == "landed" {
573
            break;
574
        }
575
        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
576
        p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
577
    }
578
    assert_eq!((p.state.as_str(), p.landed_via.as_str()), ("landed", "push"), "{p:?}");
579
}
580
581
/// #140: a proposal is closed and reopened through the API, as the page's
582
/// buttons do, by its author or someone with triage access.
583
#[tokio::test(flavor = "multi_thread")]
584
async fn a_proposal_is_closed_and_reopened_through_the_api() {
585
    let h = hub().await;
586
    let app = &h.app;
587
    let andy = register(app, "andy").await;
588
    let repo = RepoName::parse("andy/demo").unwrap();
589
    app.repos.create(&repo, None).unwrap();
590
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
591
    let work = tempfile::tempdir().unwrap();
592
    let mut client = Repo::init(work.path()).unwrap();
593
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
594
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
595
    client.config.set("remote.origin.token", "site").unwrap();
596
    client.save_config().unwrap();
597
    write(work.path(), "a.txt", b"one\n");
598
    client.snapshot("t").unwrap();
599
    let base = client.commit("base", &[]).unwrap();
600
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
601
    client.bookmark_create("feature", Some(&[base])).unwrap();
602
    client.bookmark_switch("feature", false).unwrap();
603
    write(work.path(), "a.txt", b"one\ntwo\n");
604
    client.snapshot("t").unwrap();
605
    client.commit("add two", &[]).unwrap();
606
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
607
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
608
    let csrf = csrf_of(&preview.body);
609
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=Two&body=&target=main&source=feature")).await;
610
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
611
612
    let patch = |json: &'static str, bearer: Option<&'static str>| async move {
613
        let mut req =
614
            Request::builder().method("PATCH").uri("/api/v1/repos/andy/demo/proposals/1").header(header::CONTENT_TYPE, "application/json");
615
        if let Some(b) = bearer {
616
            req = req.header(header::AUTHORIZATION, format!("Bearer {b}"));
617
        }
618
        let res = oxygenhub::router(app.clone()).oneshot(req.body(Body::from(json)).unwrap()).await.unwrap();
619
        let st = res.status();
620
        (st, String::from_utf8_lossy(&res.into_body().collect().await.unwrap().to_bytes()).into_owned())
621
    };
622
    let state = || async { db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().state };
623
    // The site token acts for the first administrator, andy.
624
    let (st, body) = patch(r#"{"state":"closed"}"#, Some("site")).await;
625
    assert_eq!(st, StatusCode::OK, "{body}");
626
    assert_eq!(state().await, "closed");
627
    assert_eq!(patch(r#"{"state":"closed"}"#, Some("site")).await.0, StatusCode::OK, "closing a closed proposal changes nothing");
628
    let (st, _) = patch(r#"{"state":"open"}"#, Some("site")).await;
629
    assert_eq!(st, StatusCode::OK);
630
    assert_eq!(state().await, "open");
631
    assert_eq!(patch(r#"{"state":"landed"}"#, Some("site")).await.0, StatusCode::BAD_REQUEST, "landing has its own endpoint");
632
    assert_ne!(patch(r#"{"state":"closed"}"#, None).await.0, StatusCode::OK, "not without a token");
633
    assert_eq!(state().await, "open");
634
}
635
636
/// Metal Gear 2's finding: a landed proposal's "Closes #N" closed nothing,
637
/// because only changes a push imports were read. Changes that arrive on
638
/// the default bookmark close issues however they get there.
639
#[tokio::test(flavor = "multi_thread")]
640
async fn closes_in_a_landed_change_closes_the_issue() {
641
    let h = hub().await;
642
    let app = &h.app;
643
    let andy = register(app, "andy").await;
644
    let repo = RepoName::parse("andy/demo").unwrap();
645
    app.repos.create(&repo, None).unwrap();
646
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
647
    let json = |method: &'static str, path: String, body: &'static str| async move {
648
        let res = oxygenhub::router(app.clone())
649
            .oneshot(
650
                Request::builder()
651
                    .method(method)
652
                    .uri(path)
653
                    .header(header::AUTHORIZATION, "Bearer site")
654
                    .header(header::CONTENT_TYPE, "application/json")
655
                    .body(Body::from(body))
656
                    .unwrap(),
657
            )
658
            .await
659
            .unwrap();
660
        let st = res.status();
661
        (st, String::from_utf8_lossy(&res.into_body().collect().await.unwrap().to_bytes()).into_owned())
662
    };
663
    for t in ["one", "two"] {
664
        let body: &'static str = if t == "one" { r#"{"title":"one"}"# } else { r#"{"title":"two"}"# };
665
        let (st, b) = json("POST", "/api/v1/repos/andy/demo/issues".into(), body).await;
666
        assert_eq!(st, StatusCode::CREATED, "{b}");
667
    }
668
    let work = tempfile::tempdir().unwrap();
669
    let mut client = Repo::init(work.path()).unwrap();
670
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
671
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
672
    client.config.set("remote.origin.token", "site").unwrap();
673
    client.save_config().unwrap();
674
    write(work.path(), "a.txt", b"one\n");
675
    client.snapshot("t").unwrap();
676
    let base = client.commit("base", &[]).unwrap();
677
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
678
    client.bookmark_create("feature", Some(&[base])).unwrap();
679
    client.bookmark_switch("feature", false).unwrap();
680
    write(work.path(), "b.txt", b"b\n");
681
    client.snapshot("t").unwrap();
682
    client.commit("add b\n\nCloses #1", &[]).unwrap();
683
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
684
    let state = |n: i64| async move { db::issues::get(&app.db, 1, n).await.unwrap().unwrap().state };
685
    assert_eq!(state(1).await, "open", "a push to another bookmark closes nothing");
686
687
    // Landed on the hub: #1 closes.
688
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
689
    let csrf = csrf_of(&preview.body);
690
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=B&body=&target=main&source=feature")).await;
691
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
692
    let number = db::proposals::list(&app.db, 1, &["open"]).await.unwrap()[0].number;
693
    let (st, b) = json("POST", format!("/api/v1/repos/andy/demo/proposals/{number}/land"), "{}").await;
694
    assert_eq!(st, StatusCode::OK, "{b}");
695
    assert_eq!(state(1).await, "closed", "landing closes what the change says");
696
697
    // A client moving main to a change the hub already holds: #2 closes.
698
    client.bookmark_create("other", Some(&[base])).unwrap();
699
    client.bookmark_switch("other", false).unwrap();
700
    write(work.path(), "c.txt", b"c\n");
701
    client.snapshot("t").unwrap();
702
    let c = client.commit("add c, closes #2", &[]).unwrap();
703
    assert!(client.push_bookmark("origin", "other", false).unwrap().iter().all(|r| r.ok));
704
    assert_eq!(state(2).await, "open");
705
    let (_, list) = json("GET", "/api/v1/repos/andy/demo/bookmarks".into(), "").await;
706
    let list: Vec<serde_json::Value> = serde_json::from_str(&list).unwrap();
707
    let main = list.iter().find(|b| b["name"] == "main").unwrap();
708
    let mut heads: Vec<oxy_core::hash::ChangeHash> =
709
        main["heads"].as_array().unwrap().iter().map(|h| oxy_core::hash::ChangeHash::from_hex(h.as_str().unwrap()).unwrap()).collect();
710
    client.fetch("origin").unwrap();
711
    heads.push(c);
712
    client.bookmark_set("main", &heads).unwrap();
713
    assert!(client.push_bookmark("origin", "main", false).unwrap().iter().all(|r| r.ok));
714
    let mut s2 = state(2).await;
715
    for _ in 0..100 {
716
        if s2 == "closed" {
717
            break;
718
        }
719
        tokio::time::sleep(std::time::Duration::from_millis(30)).await;
720
        s2 = state(2).await;
721
    }
722
    assert_eq!(s2, "closed", "a change arriving by push closes it, though the hub held it already");
723
}