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