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