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