OXYGENHUB
◆ v0.9.3 oxygenhub / crates / hub / tests / proposals.rs
58.2 KiB · Rust · last changed A push reuses a job's pass on the same state (closes #265) 15 days ago source blame history raw
de505df5 Andy McCall ↶ 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();
c8684d44 Andy McCall 42
    // The first account's setup code (oxygenhub#245).
43
    config.registration.setup_code = "test-setup".into();
de505df5 Andy McCall ↶ 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}");
9a777fec Andy McCall ↶ 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()];
de505df5 Andy McCall ↶ 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
a1b98695 Andy McCall ↶ 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
de505df5 Andy McCall ↶ 112
async fn register(app: &Shared, user: &str) -> String {
c8684d44 Andy McCall 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;
de505df5 Andy McCall ↶ 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
3d1e74cd Andy McCall ↶ 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
de505df5 Andy McCall ↶ 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"));
3d1e74cd Andy McCall ↶ 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");
de505df5 Andy McCall ↶ 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);
a1b98695 Andy McCall ↶ 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;
de505df5 Andy McCall ↶ 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
b5a0a69b Andy McCall ↶ 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;
33d98147 Andy McCall 204
    let heard = match app.bus.live.since(0, std::slice::from_ref(&topic)) {
b5a0a69b Andy McCall ↶ 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
de505df5 Andy McCall ↶ 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,
c7067c7b Andy McCall 227
        StatusCode::SEE_OTHER,
228
        "back to Settings › Landing rules"
de505df5 Andy McCall ↶ 229
    );
230
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
231
    assert!(page.body.contains("0 of 1 required sealed approvals"), "{}", page.body);
232
    assert!(page.body.contains("code owners still to approve: andy"), "{}", page.body);
233
234
    // Bob cannot approve his own; Andy approves, which is pending until sealed.
235
    let csrf_b = csrf_of(&get(app, "/andy/demo/proposal/1", Some(&bob)).await.body);
a1b98695 Andy McCall ↶ 236
    let r = act(app, "/andy/demo/proposal/1/review", Some(&bob), &format!("_csrf={csrf_b}&verdict=approve")).await;
de505df5 Andy McCall ↶ 237
    assert!(r.body.contains("cannot approve your own"), "{}", r.body);
a1b98695 Andy McCall ↶ 238
    let r = act(app, "/andy/demo/proposal/1/review", Some(&andy), &format!("_csrf={csrf_a}&verdict=approve&body=LGTM")).await;
de505df5 Andy McCall ↶ 239
    assert!(r.body.contains("seal pending"), "{}", r.body);
240
    assert!(r.body.contains("oxy seal --proposal"));
241
242
    // Andy links his key, seals the proposal's change and pushes the seal: the approval counts.
243
    let key = client.config.author_key.unwrap();
244
    let identity = client.identity(&key).unwrap();
245
    db::accounts::link_identity(
246
        &app.db,
247
        db::accounts::account_by_name(&app.db, "andy").await.unwrap().unwrap().id,
248
        &key.to_hex(),
249
        &identity.name,
250
        &identity.email,
251
        &identity.encode(),
252
    )
253
    .await
254
    .unwrap();
255
    let seal = client.seal(&[feat]).unwrap();
256
    client.push_seals("origin", &[seal]).unwrap();
257
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
258
    assert!(page.body.contains("approved and sealed"), "{}", page.body);
259
    assert!(page.body.contains("ready to land"), "{}", page.body);
260
    // The API agrees, and names the projected heads for `oxy proposal land`.
261
    let api = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1", None, None, Some("site")).await;
262
    assert_eq!(api.status, StatusCode::OK);
263
    let v: serde_json::Value = serde_json::from_str(&api.body).unwrap();
264
    assert_eq!(v["landable"], true, "{}", api.body);
265
    assert_eq!(v["approvals"][0]["sealed"], true);
266
    assert_eq!(v["projected_heads"][0], feat.to_hex());
267
    assert_eq!(v["changes"][0]["hash"], feat.to_hex());
268
269
    // Land from the hub (no policy): main moves to the projected heads.
270
    let csrf_a = csrf_of(&page.body);
a1b98695 Andy McCall ↶ 271
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={csrf_a}")).await;
de505df5 Andy McCall ↶ 272
    assert!(r.body.contains("Landed."), "{}", r.body);
273
    let heads = app.repos.read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().find(|b| b.name == "main").unwrap().heads)).await.unwrap();
274
    assert_eq!(heads, vec![feat]);
275
    assert!(get(app, "/andy/demo/proposals?state=landed", None).await.body.contains("#1"));
0b20f1ec Andy McCall ↶ 276
    assert!(get(app, "/andy/demo/pushes", None).await.body.contains("landed #1 (web)"));
277
    // Landed, it still shows what it landed, by whom and how, and nothing holds it back.
278
    let api = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1", None, None, Some("site")).await;
279
    let v: serde_json::Value = serde_json::from_str(&api.body).unwrap();
280
    assert_eq!(v["state"], "landed", "{}", api.body);
281
    assert_eq!(v["changes"][0]["hash"], feat.to_hex(), "{}", api.body);
282
    assert_eq!(v["blockers"], serde_json::json!([]), "{}", api.body);
283
    assert_eq!(v["landed"]["by"], "andy");
284
    assert_eq!(v["landed"]["via"], "web");
285
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
286
    assert!(page.body.contains("by <a href=\"/andy\">andy</a>, web"), "{}", page.body);
4f37afcc Andy McCall ↶ 287
    // oxygenhub#86: a landed card offering to delete the source bookmark,
288
    // the description edited in place from its ··· menu or the pencil.
289
    assert!(page.body.contains("Proposal landed") && page.body.contains("value=\"feature\""), "{}", page.body);
290
    assert!(page.body.contains("can be safely deleted"), "{}", page.body);
291
    assert!(page.body.contains("class=\"head-pencil\"") && page.body.contains("id=\"edit\"") && page.body.contains("Copy link"));
292
    assert!(!page.body.contains("Edit title, target and description</summary>"), "no disclosure at the bottom");
293
    let csrf = csrf_of(&page.body);
294
    let r = post(app, "/andy/demo/bookmarks/delete", Some(&andy), &format!("_csrf={csrf}&bookmark=feature")).await;
295
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
296
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
297
    assert!(page.body.contains("Proposal landed") && !page.body.contains("can be safely deleted"), "gone, so not offered again");
0b20f1ec Andy McCall ↶ 298
    // Lists by state through the API.
299
    let list = |q: &'static str| async move {
300
        let r = send(app, "GET", &format!("/api/v1/repos/andy/demo/proposals{q}"), None, None, Some("site")).await;
301
        serde_json::from_str::<serde_json::Value>(&r.body).unwrap().as_array().unwrap().len()
302
    };
303
    assert_eq!(list("").await, 0, "open ones only by default");
304
    assert_eq!(list("?state=landed").await, 1);
305
    assert_eq!(list("?state=all").await, 1);
de505df5 Andy McCall ↶ 306
307
    // A proposal from a fork: a copy of the repository with the same id.
308
    let fork = RepoName::parse("bob/demo").unwrap();
309
    app.repos.create(&fork, Some(client.id().unwrap())).unwrap();
310
    db::repos::create(&app.db, "bob", "demo", "fork", hub_api::Visibility::Public).await.unwrap();
311
    db::accounts::set_collaborator(
312
        &app.db,
313
        db::repos::get(&app.db, "bob", "demo").await.unwrap().unwrap().id,
314
        Some(db::accounts::account_by_name(&app.db, "bob").await.unwrap().unwrap().id),
315
        None,
316
        "admin",
317
    )
318
    .await
319
    .unwrap();
320
    client.config.set("remote.fork.url", &format!("{}/bob/demo", h.base)).unwrap();
321
    client.config.set("remote.fork.token", "site").unwrap();
322
    client.bookmark_switch("main", false).unwrap();
323
    client.fetch("origin").unwrap();
324
    client.bookmark_set("main", &[feat]).unwrap();
325
    client.bookmark_create("fix", Some(&[feat])).unwrap();
326
    client.bookmark_switch("fix", false).unwrap();
327
    write(work.path(), "b.txt", b"b\n");
328
    client.snapshot("t").unwrap();
329
    let fix = client.commit("add b", &[]).unwrap();
330
    assert!(client.push_bookmark("fork", "fix", false).unwrap().iter().all(|r| r.ok));
331
    let preview = get(app, "/andy/demo/proposals/new?source=bob/demo:fix&target=main", Some(&bob)).await;
332
    assert!(preview.body.contains("add b"), "fork preview: {}", preview.body);
333
    let csrf = csrf_of(&preview.body);
334
    let r =
335
        post(app, "/andy/demo/proposals/new", Some(&bob), &format!("_csrf={csrf}&title=From+fork&target=main&source=bob/demo:fix")).await;
336
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
337
    let page = get(app, "/andy/demo/proposal/2?tab=changes", Some(&andy)).await;
338
    assert!(page.body.contains("add b"), "{}", page.body);
339
    assert!(
340
        app.repos.read(&repo, move |r, _| Ok(r.store().has(&fix))).await.unwrap(),
341
        "the fork's change was copied into the target's store"
342
    );
343
    // Closing and reopening.
344
    let csrf_b = csrf_of(&get(app, "/andy/demo/proposal/2", Some(&bob)).await.body);
a1b98695 Andy McCall ↶ 345
    let r = act(app, "/andy/demo/proposal/2/state", Some(&bob), &format!("_csrf={csrf_b}&action=close")).await;
de505df5 Andy McCall ↶ 346
    assert!(r.body.contains(">closed<"), "{}", r.body);
a1b98695 Andy McCall ↶ 347
    let r = act(app, "/andy/demo/proposal/2/state", Some(&bob), &format!("_csrf={csrf_b}&action=reopen")).await;
de505df5 Andy McCall ↶ 348
    assert!(r.body.contains(">open<"), "{}", r.body);
349
}
7d2eb590 Andy McCall ↶ 350
351
/// A stand-in chat-completions endpoint that answers with a fixed review
352
/// and keeps the body of each call.
353
async fn mock_assistant(answer: &'static str) -> (String, std::sync::Arc<std::sync::Mutex<Vec<String>>>) {
354
    use std::sync::{Arc, Mutex};
355
    let seen: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
356
    let s2 = seen.clone();
357
    let router = axum::Router::new().route(
358
        "/v1/chat/completions",
359
        axum::routing::post(move |headers: axum::http::HeaderMap, body: String| {
360
            let s2 = s2.clone();
361
            async move {
362
                let auth = headers.get("authorization").and_then(|v| v.to_str().ok()).unwrap_or("").to_string();
363
                s2.lock().unwrap().push(format!("{auth} {body}"));
364
                axum::Json(serde_json::json!({ "choices": [{ "message": { "role": "assistant", "content": answer } }] }))
365
            }
366
        }),
367
    );
368
    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
369
    let port = listener.local_addr().unwrap().port();
370
    tokio::spawn(async move { axum::serve(listener, router).await.unwrap() });
371
    (format!("http://127.0.0.1:{port}/v1/chat/completions"), seen)
372
}
373
374
#[tokio::test(flavor = "multi_thread")]
375
async fn an_assistant_reviews_a_proposal_via_the_person_who_asked() {
376
    let h = hub().await;
377
    let app = &h.app;
378
    let andy = register(app, "andy").await;
379
    let bob = register(app, "bob").await;
380
    let repo = RepoName::parse("andy/demo").unwrap();
381
    app.repos.create(&repo, None).unwrap();
382
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
383
    let work = tempfile::tempdir().unwrap();
384
    let mut client = Repo::init(work.path()).unwrap();
385
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
386
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
387
    client.config.set("remote.origin.token", "site").unwrap();
388
    client.config.set("core.sign", "change").unwrap();
389
    client.save_config().unwrap();
390
    write(work.path(), "a.txt", b"one\ntwo\n");
391
    client.snapshot("t").unwrap();
392
    let base = client.commit("base", &[]).unwrap();
393
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
394
    client.bookmark_create("feature", Some(&[base])).unwrap();
395
    client.bookmark_switch("feature", false).unwrap();
396
    write(work.path(), "a.txt", b"one\ntwo\nthree\n");
397
    client.snapshot("t").unwrap();
398
    client.commit("add three", &[]).unwrap();
399
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
400
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&bob)).await;
401
    let csrf_b = csrf_of(&preview.body);
402
    let r = post(
403
        app,
404
        "/andy/demo/proposals/new",
405
        Some(&bob),
406
        &format!("_csrf={csrf_b}&title=Add+three&body=Please&target=main&source=feature"),
407
    )
408
    .await;
409
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
410
411
    // Nothing to ask until the site has an assistant.
412
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
ed89fae5 Andy McCall ↶ 413
    assert!(!page.contains("Ask Claude"), "{page}");
7d2eb590 Andy McCall ↶ 414
    let (endpoint, seen) = mock_assistant("**Summary.** Adds a third line.\n\n- a.txt line 3: fine.").await;
415
    let admin = get(app, "/admin", Some(&andy)).await.body;
416
    let csrf_a = csrf_of(&admin);
417
    let ep = endpoint.replace(':', "%3A").replace('/', "%2F");
418
    let r = post(
419
        app,
420
        "/admin/assistants",
421
        Some(&andy),
422
        &format!("_csrf={csrf_a}&action=add&name=Claude&endpoint={ep}&api=chat-completions&model=claude-opus-5-5&token=sk-test&enabled=1"),
423
    )
424
    .await;
206c1fc1 Andy McCall ↶ 425
    assert!(r.body.contains("Claude added and answered"), "{}", r.body);
426
    seen.lock().unwrap().clear();
7d2eb590 Andy McCall ↶ 427
    let r =
428
        post(app, "/admin/assistants", Some(&andy), &format!("_csrf={csrf_a}&action=prompt&prompt=Review+for+correctness+first.")).await;
429
    assert!(r.body.contains("Prompt saved."), "{}", r.body);
430
431
    // Claude drafts a description for a proposal not yet opened, and for
432
    // the open one; neither is saved until the person says so.
433
    let page = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&bob)).await.body;
ed89fae5 Andy McCall ↶ 434
    assert!(page.contains("Draft with Claude"), "{page}");
7d2eb590 Andy McCall ↶ 435
    let r = post(
436
        app,
437
        "/andy/demo/proposals/new/draft",
438
        Some(&bob),
439
        &format!("_csrf={}&title=Add+three&body=&target=main&source=feature&assistant=Claude", csrf_of(&page)),
440
    )
441
    .await;
442
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
443
    assert!(r.body.contains("rows=\"8\">**Summary.** Adds a third line.") && r.body.contains("value=\"Add three\""), "{}", r.body);
444
    {
445
        let calls = seen.lock().unwrap();
446
        assert_eq!(calls.len(), 1);
447
        assert!(
448
            calls[0].contains("drafting the description") && calls[0].contains("+three") && calls[0].contains("Proposal: Add three"),
449
            "{}",
450
            calls[0]
451
        );
452
    }
453
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
ed89fae5 Andy McCall ↶ 454
    assert!(page.contains("Draft with Claude"), "{page}");
7d2eb590 Andy McCall ↶ 455
    let r =
456
        post(app, "/andy/demo/proposal/1/draft", Some(&bob), &format!("_csrf={}&assistant=Claude&title=Add+three", csrf_of(&page))).await;
457
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
458
    assert!(
459
        r.body.contains("tl-editform open") && r.body.contains("aria-label=\"Description (Markdown)\">**Summary.** Adds a third line."),
460
        "{}",
461
        r.body
462
    );
463
    assert!(r.body.contains("nothing is saved until you update"), "{}", r.body);
464
    assert_eq!(db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().body, "Please", "the description is untouched");
465
    assert_eq!(seen.lock().unwrap().len(), 2);
466
    seen.lock().unwrap().clear();
467
119fd17d Andy McCall ↶ 468
    // The same as a stream for the page to show as it comes (#248): the
469
    // button says where, and the draft arrives in parts, then whole.
470
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
471
    assert!(page.contains("data-stream=\"/andy/demo/proposal/1/draft/stream\""), "{page}");
472
    let form = format!("_csrf={}&assistant=Claude&title=Add+three", csrf_of(&page));
473
    let r = post(app, "/andy/demo/proposal/1/draft/stream", Some(&bob), &form).await;
474
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
475
    assert!(r.body.contains("event: part") && r.body.contains("event: done"), "{}", r.body);
476
    assert!(r.body.contains("Adds a third line."), "{}", r.body);
477
    assert_eq!(db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().body, "Please", "still nothing saved");
478
    let r = post(app, "/andy/demo/proposal/1/draft/stream", Some(&bob), &form.replace("Claude", "Nobody")).await;
479
    assert!(r.body.contains("event: error") && r.body.contains("No assistant called Nobody"), "{}", r.body);
480
    seen.lock().unwrap().clear();
481
7d2eb590 Andy McCall ↶ 482
    // Andy approves; then Bob, the author, asks Claude.
483
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
484
    let r = post(app, "/andy/demo/proposal/1/review", Some(&andy), &format!("_csrf={}&verdict=approve&body=good", csrf_of(&page))).await;
485
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
486
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
ed89fae5 Andy McCall ↶ 487
    assert!(page.contains("Ask Claude"), "{page}");
7d2eb590 Andy McCall ↶ 488
    let r = act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=claude", csrf_of(&page))).await;
489
    assert!(r.body.contains("Asked Claude to review"), "{}", r.body);
490
    let mut reviews = vec![];
491
    for _ in 0..100 {
492
        reviews = db::proposals::reviews(&app.db, 1).await.unwrap();
493
        if reviews.iter().any(|r| r.via == "Claude") {
494
            break;
495
        }
496
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
497
    }
498
    let claude = reviews.iter().find(|r| r.via == "Claude").expect("the assistant's review arrived");
499
    assert_eq!((claude.author.as_str(), claude.verdict.as_str()), ("bob", "comment"));
500
    assert!(claude.body.contains("Adds a third line"));
501
    {
502
        let calls = seen.lock().unwrap();
503
        assert_eq!(calls.len(), 1);
504
        let c = &calls[0];
505
        assert!(c.starts_with("Bearer sk-test "), "{c}");
506
        assert!(
507
            c.contains("You are Claude") && c.contains("Review for correctness first."),
508
            "the system prompt and the site's prompt: {c}"
509
        );
510
        assert!(c.contains("Proposal #1: Add three") && c.contains("a.txt (modified)") && c.contains("+three"), "the context: {c}");
511
    }
512
    // Shown as Bob via Claude, with the event; Andy's approval still counts.
513
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
514
    assert!(
515
        page.contains("<strong>bob</strong></a> <span class=\"mute\" aria-hidden=\"true\">↳</span> <span class=\"tag\"")
516
            && page.contains("<strong>Claude</strong>"),
517
        "{page}"
518
    );
519
    assert!(page.contains("asked Claude to review") && page.contains("Adds a third line"), "{page}");
520
    let p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
521
    let loaded = oxygenhub::web::proposals::load(app, &repo, p).await.unwrap();
522
    let v = oxygenhub::web::proposals::verdict(app, &loaded, 1).await.unwrap();
523
    assert!(v.approvals.iter().any(|a| a.account == "andy"), "{:?}", v.approvals.iter().map(|a| &a.account).collect::<Vec<_>>());
ffb67a81 Andy McCall 524
    // Bob asks Claude for a summary (#190): it comes as a comment via Claude.
525
    assert!(page.contains("Summarise with Claude"), "{page}");
526
    seen.lock().unwrap().clear();
527
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
528
    let r =
529
        act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=Claude&task=summary", csrf_of(&page))).await;
530
    assert!(r.body.contains("Asked Claude for a summary"), "{}", r.body);
531
    let mut comments = vec![];
532
    for _ in 0..100 {
533
        comments = db::proposals::comments(&app.db, 1).await.unwrap();
534
        if comments.iter().any(|c| c.via == "Claude") {
535
            break;
536
        }
537
        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
538
    }
539
    let summary = comments.iter().find(|c| c.via == "Claude").expect("the assistant's summary arrived");
540
    assert_eq!(summary.author, "bob");
541
    assert!(summary.body.contains("Adds a third line"));
542
    {
543
        let calls = seen.lock().unwrap();
544
        assert_eq!(calls.len(), 1);
545
        let c = &calls[0];
546
        assert!(
547
            c.contains("called Oxygen")
548
                && c.contains("equivalent of a merge request or pull request")
549
                && c.contains("Please summarise the proposal"),
550
            "{c}"
551
        );
552
        assert!(c.contains("Review for correctness first.") && c.contains("+three"), "the site's prompt and the context: {c}");
553
    }
554
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
555
    assert!(page.contains("asked Claude for a summary") && page.contains("wrote this for bob"), "{page}");
7d2eb590 Andy McCall ↶ 556
    // The API lists the review via Claude and takes requests too.
557
    let r = send(app, "GET", "/api/v1/repos/andy/demo/proposals/1/reviews", None, None, None).await;
558
    assert!(r.body.contains("\"via\":\"Claude\""), "{}", r.body);
ed89fae5 Andy McCall ↶ 559
    // Renaming the assistant renames it on the review and in the events.
560
    let admin = get(app, "/admin", Some(&andy)).await.body;
561
    let r = post(
562
        app,
563
        "/admin/assistants",
564
        Some(&andy),
565
        &format!(
566
            "_csrf={}&action=update&id={}&name=Claude+Code&endpoint={ep}&api=chat-completions&model=claude-opus-5-5&token=&enabled=1",
567
            csrf_of(&admin),
568
            oxygenhub::assistants::list(&app.db, oxygenhub::levels::Scope::Site).await.unwrap()[0].id
569
        ),
570
    )
571
    .await;
572
    assert!(r.body.contains("Claude Code updated."), "{}", r.body);
573
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await.body;
574
    assert!(page.contains("<strong>Claude Code</strong>") && page.contains("asked Claude Code to review"), "{page}");
575
    assert!(!page.contains("<strong>Claude</strong>"), "{page}");
7d2eb590 Andy McCall ↶ 576
    // A stranger cannot ask; an unknown assistant is refused.
577
    post(app, "/andy/demo/proposal/1/assistant", None, "_csrf=x&assistant=Claude").await;
578
    assert_eq!(seen.lock().unwrap().len(), 1, "no call for a stranger");
579
    let page = get(app, "/andy/demo/proposal/1", Some(&bob)).await.body;
580
    let r = act(app, "/andy/demo/proposal/1/assistant", Some(&bob), &format!("_csrf={}&assistant=HAL", csrf_of(&page))).await;
581
    assert!(r.body.contains("No assistant called HAL"), "{}", r.body);
582
}
ac713df7 Andy McCall ↶ 583
584
/// #141: a proposal whose work reaches its target another way (a client's
585
/// `oxy proposal land`, as a trust policy needs, or a merge pushed by hand)
586
/// is marked landed by that push, not left open with nothing to land.
587
#[tokio::test(flavor = "multi_thread")]
588
async fn a_proposal_landed_by_a_push_is_marked_landed() {
589
    let h = hub().await;
590
    let app = &h.app;
591
    let andy = register(app, "andy").await;
592
    let repo = RepoName::parse("andy/demo").unwrap();
593
    app.repos.create(&repo, None).unwrap();
594
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
595
    let work = tempfile::tempdir().unwrap();
596
    let mut client = Repo::init(work.path()).unwrap();
597
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
598
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
599
    client.config.set("remote.origin.token", "site").unwrap();
600
    client.save_config().unwrap();
601
    write(work.path(), "a.txt", b"one\n");
602
    client.snapshot("t").unwrap();
603
    let base = client.commit("base", &[]).unwrap();
604
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
605
    client.bookmark_create("feature", Some(&[base])).unwrap();
606
    client.bookmark_switch("feature", false).unwrap();
607
    write(work.path(), "a.txt", b"one\ntwo\n");
608
    client.snapshot("t").unwrap();
609
    let feat = client.commit("add two", &[]).unwrap();
610
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
611
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
612
    let csrf = csrf_of(&preview.body);
613
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=Two&body=&target=main&source=feature")).await;
614
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
615
    assert_eq!(db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().state, "open");
616
617
    // The work goes onto main by a push, not by the Land button.
618
    client.bookmark_set("main", &[feat]).unwrap();
619
    assert!(client.push_bookmark("origin", "main", false).unwrap().iter().all(|r| r.ok));
620
    let mut p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
621
    for _ in 0..100 {
622
        if p.state == "landed" {
623
            break;
624
        }
625
        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
626
        p = db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap();
627
    }
628
    assert_eq!((p.state.as_str(), p.landed_via.as_str()), ("landed", "push"), "{p:?}");
629
}
71e65fcf Andy McCall ↶ 630
631
/// #140: a proposal is closed and reopened through the API, as the page's
632
/// buttons do, by its author or someone with triage access.
633
#[tokio::test(flavor = "multi_thread")]
634
async fn a_proposal_is_closed_and_reopened_through_the_api() {
635
    let h = hub().await;
636
    let app = &h.app;
637
    let andy = register(app, "andy").await;
638
    let repo = RepoName::parse("andy/demo").unwrap();
639
    app.repos.create(&repo, None).unwrap();
640
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
641
    let work = tempfile::tempdir().unwrap();
642
    let mut client = Repo::init(work.path()).unwrap();
643
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
644
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
645
    client.config.set("remote.origin.token", "site").unwrap();
646
    client.save_config().unwrap();
647
    write(work.path(), "a.txt", b"one\n");
648
    client.snapshot("t").unwrap();
649
    let base = client.commit("base", &[]).unwrap();
650
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
651
    client.bookmark_create("feature", Some(&[base])).unwrap();
652
    client.bookmark_switch("feature", false).unwrap();
653
    write(work.path(), "a.txt", b"one\ntwo\n");
654
    client.snapshot("t").unwrap();
655
    client.commit("add two", &[]).unwrap();
656
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
657
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
658
    let csrf = csrf_of(&preview.body);
659
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=Two&body=&target=main&source=feature")).await;
660
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
661
662
    let patch = |json: &'static str, bearer: Option<&'static str>| async move {
663
        let mut req =
664
            Request::builder().method("PATCH").uri("/api/v1/repos/andy/demo/proposals/1").header(header::CONTENT_TYPE, "application/json");
665
        if let Some(b) = bearer {
666
            req = req.header(header::AUTHORIZATION, format!("Bearer {b}"));
667
        }
668
        let res = oxygenhub::router(app.clone()).oneshot(req.body(Body::from(json)).unwrap()).await.unwrap();
669
        let st = res.status();
670
        (st, String::from_utf8_lossy(&res.into_body().collect().await.unwrap().to_bytes()).into_owned())
671
    };
672
    let state = || async { db::proposals::get(&app.db, 1, 1).await.unwrap().unwrap().state };
673
    // The site token acts for the first administrator, andy.
674
    let (st, body) = patch(r#"{"state":"closed"}"#, Some("site")).await;
675
    assert_eq!(st, StatusCode::OK, "{body}");
676
    assert_eq!(state().await, "closed");
677
    assert_eq!(patch(r#"{"state":"closed"}"#, Some("site")).await.0, StatusCode::OK, "closing a closed proposal changes nothing");
678
    let (st, _) = patch(r#"{"state":"open"}"#, Some("site")).await;
679
    assert_eq!(st, StatusCode::OK);
680
    assert_eq!(state().await, "open");
681
    assert_eq!(patch(r#"{"state":"landed"}"#, Some("site")).await.0, StatusCode::BAD_REQUEST, "landing has its own endpoint");
682
    assert_ne!(patch(r#"{"state":"closed"}"#, None).await.0, StatusCode::OK, "not without a token");
683
    assert_eq!(state().await, "open");
684
}
acc85ac0 Andy McCall ↶ 685
2a8b6216 Andy McCall ↶ 686
/// Landing over checks (#261): with required checks not passed, a
687
/// maintainer may land now with a reason, recorded and audited; a writer
688
/// may not, nor anyone without a reason.
689
#[tokio::test(flavor = "multi_thread")]
690
async fn a_maintainer_lands_over_checks_with_a_reason() {
691
    let h = hub().await;
692
    let app = &h.app;
693
    let andy = register(app, "andy").await;
694
    let bob = register(app, "bob").await;
695
    let repo = RepoName::parse("andy/demo").unwrap();
696
    app.repos.create(&repo, None).unwrap();
697
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
698
    let row = db::repos::get(&app.db, "andy", "demo").await.unwrap().unwrap();
699
    let bob_id = db::accounts::account_by_name(&app.db, "bob").await.unwrap().unwrap().id;
700
    db::accounts::set_collaborator(&app.db, row.id, Some(bob_id), None, "write").await.unwrap();
701
    let work = tempfile::tempdir().unwrap();
702
    let mut client = Repo::init(work.path()).unwrap();
703
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
704
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
705
    client.config.set("remote.origin.token", "site").unwrap();
706
    client.save_config().unwrap();
707
    write(work.path(), "a.txt", b"one\n");
708
    client.snapshot("t").unwrap();
709
    let base = client.commit("base", &[]).unwrap();
710
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
711
    client.bookmark_create("feature", Some(&[base])).unwrap();
712
    client.bookmark_switch("feature", false).unwrap();
713
    write(work.path(), "b.txt", b"b\n");
714
    client.snapshot("t").unwrap();
715
    client.commit("the fix", &[]).unwrap();
716
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
717
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
718
    let r = post(
719
        app,
720
        "/andy/demo/proposals/new",
721
        Some(&andy),
722
        &format!("_csrf={}&title=Fix&body=&target=main&source=feature", csrf_of(&preview.body)),
723
    )
724
    .await;
725
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
726
    db::hooks::set_required_checks(&app.db, row.id, &["flow/test".to_string()]).await.unwrap();
727
728
    // The checks block it; the maintainer is offered landing over them.
729
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
730
    assert!(page.body.contains("required checks not passed") && page.body.contains("Land now, over the checks"), "{}", page.body);
731
    let csrf = csrf_of(&page.body);
732
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={csrf}")).await;
733
    assert!(r.body.contains("Cannot land: required checks not passed"), "plain land is refused: {}", r.body);
734
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "open");
735
    // A writer is not offered it and cannot do it.
736
    let bob_page = get(app, "/andy/demo/proposal/1", Some(&bob)).await;
737
    assert!(!bob_page.body.contains("Land now, over the checks"));
738
    let r = post(app, "/andy/demo/proposal/1/land", Some(&bob), &format!("_csrf={}&over_checks=please", csrf_of(&bob_page.body))).await;
739
    assert_eq!(r.status, StatusCode::NOT_FOUND, "a writer cannot land over checks");
740
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "open");
741
    // No reason, no landing.
742
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={csrf}&over_checks=+")).await;
743
    assert!(r.body.contains("needs a reason"), "{}", r.body);
744
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "open");
745
    // With one: landed, and it says so.
746
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={csrf}&over_checks=the+runners+are+down")).await;
747
    assert!(r.body.contains("over checks: the runners are down"), "the landing says so: {}", r.body);
748
    let p = db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap();
749
    assert_eq!(p.state, "landed");
750
    assert!(p.landed_via.contains("over checks: the runners are down"), "{}", p.landed_via);
751
    let audit = db::accounts::audit_rows(&app.db, 20).await.unwrap();
752
    assert!(audit
753
        .iter()
754
        .any(|a| a.action == "proposal.land_over_checks" && a.detail.contains("the runners are down") && a.detail.contains("flow/test")));
755
}
756
2abea308 Andy McCall ↶ 757
/// A landed proposal's runs that no runner has started are cancelled
758
/// (#263): they hold the queue ahead of the target's own run. A running
759
/// one finishes; another bookmark's run is untouched.
760
#[tokio::test(flavor = "multi_thread")]
761
async fn landing_cancels_the_proposals_unstarted_runs() {
762
    let h = hub().await;
763
    let app = &h.app;
764
    let andy = register(app, "andy").await;
765
    let repo = RepoName::parse("andy/demo").unwrap();
766
    app.repos.create(&repo, None).unwrap();
767
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
768
    let row = db::repos::get(&app.db, "andy", "demo").await.unwrap().unwrap();
769
    let work = tempfile::tempdir().unwrap();
770
    let mut client = Repo::init(work.path()).unwrap();
771
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
772
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
773
    client.config.set("remote.origin.token", "site").unwrap();
774
    client.save_config().unwrap();
775
    write(work.path(), "a.txt", b"one\n");
776
    client.snapshot("t").unwrap();
777
    let base = client.commit("base", &[]).unwrap();
778
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
779
    client.bookmark_create("feature", Some(&[base])).unwrap();
780
    client.bookmark_switch("feature", false).unwrap();
781
    write(work.path(), "b.txt", b"b\n");
782
    client.snapshot("t").unwrap();
783
    client.commit("the fix", &[]).unwrap();
784
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
785
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
786
    let r = post(
787
        app,
788
        "/andy/demo/proposals/new",
789
        Some(&andy),
790
        &format!("_csrf={}&title=Fix&body=&target=main&source=feature", csrf_of(&preview.body)),
791
    )
792
    .await;
793
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
794
795
    // Runs as the queue holds them: the source's push runs (one queued,
796
    // one running), the proposal's own, and another bookmark's.
797
    let run = |bookmark: &'static str, trigger: &'static str| {
798
        let app = app.clone();
799
        let repo_id = row.id;
800
        async move {
801
            let job = db::flow::NewJob {
802
                name: "test".into(),
803
                depth: 0,
804
                depends: vec![],
805
                spec: "{}".into(),
806
                sandbox: "{}".into(),
807
                runtime: "process".into(),
808
                need_disk_mib: None,
5588bb36 Andy McCall ↶ 809
                reused: None,
2abea308 Andy McCall ↶ 810
            };
811
            let new =
812
                db::flow::NewRun { repo_id, bookmark, state: "s", heads: "h", pipeline_hash: "", actor: "andy", trigger, error: None };
813
            db::flow::create_run(&app.db, new, &[job]).await.unwrap()
814
        }
815
    };
816
    let queued = run("feature", "push").await;
817
    let running = run("feature", "push").await;
818
    let own = run("proposal/1", "proposal").await;
819
    let other = run("other", "push").await;
820
    sqlx::query("UPDATE flow_runs SET status = 'running' WHERE id = $1").bind(running).execute(&app.db).await.unwrap();
821
    sqlx::query("UPDATE flow_jobs SET status = 'running' WHERE run_id = $1").bind(running).execute(&app.db).await.unwrap();
822
823
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
824
    let r = act(app, "/andy/demo/proposal/1/land", Some(&andy), &format!("_csrf={}", csrf_of(&page.body))).await;
825
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "landed", "{}", r.body);
826
827
    let status = |id: i64| {
828
        let app = app.clone();
829
        async move {
830
            let run = db::flow::run_by_id(&app.db, id).await.unwrap().unwrap();
831
            let jobs = db::flow::jobs(&app.db, id).await.unwrap();
832
            (run.status, jobs[0].error.clone())
833
        }
834
    };
835
    for id in [queued, own] {
836
        let (st, why) = status(id).await;
837
        assert_eq!(st, "cancelled");
838
        assert_eq!(why, "moot: proposal #1 landed");
839
    }
840
    assert_eq!(status(running).await.0, "running", "a started run finishes");
841
    assert_eq!(status(other).await.0, "queued", "another bookmark's run is untouched");
842
}
843
86a69b53 Andy McCall ↶ 844
/// Land when checks pass (#261): set by someone who may land, it lands as
845
/// them once the required check passes on the projected state; a failing
846
/// check turns it off, with a note; it can be turned off.
847
#[tokio::test(flavor = "multi_thread")]
848
async fn a_proposal_lands_itself_when_its_checks_pass() {
849
    let h = hub().await;
850
    let app = &h.app;
851
    let andy = register(app, "andy").await;
852
    let repo = RepoName::parse("andy/demo").unwrap();
853
    app.repos.create(&repo, None).unwrap();
854
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
855
    let row = &db::repos::get(&app.db, "andy", "demo").await.unwrap().unwrap();
856
    let work = tempfile::tempdir().unwrap();
857
    let mut client = Repo::init(work.path()).unwrap();
858
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
859
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
860
    client.config.set("remote.origin.token", "site").unwrap();
861
    client.save_config().unwrap();
862
    write(work.path(), "a.txt", b"one\n");
863
    client.snapshot("t").unwrap();
864
    let base = client.commit("base", &[]).unwrap();
865
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
866
    for (bm, file) in [("one", "b.txt"), ("two", "c.txt")] {
867
        client.bookmark_create(bm, Some(&[base])).unwrap();
868
        client.bookmark_switch(bm, false).unwrap();
869
        write(work.path(), file, b"x\n");
870
        client.snapshot("t").unwrap();
871
        client.commit(&format!("on {bm}"), &[]).unwrap();
872
        assert!(client.push_bookmark("origin", bm, false).unwrap().iter().all(|r| r.ok));
873
        let preview = get(app, &format!("/andy/demo/proposals/new?source={bm}&target=main"), Some(&andy)).await;
874
        let r = post(
875
            app,
876
            "/andy/demo/proposals/new",
877
            Some(&andy),
878
            &format!("_csrf={}&title={bm}&body=&target=main&source={bm}", csrf_of(&preview.body)),
879
        )
880
        .await;
881
        assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
882
    }
883
    db::hooks::set_required_checks(&app.db, row.id, &["flow/test".to_string()]).await.unwrap();
884
    let check = |number: i64, status: &'static str| async move {
885
        let p = db::proposals::get(&app.db, row.id, number).await.unwrap().unwrap();
886
        let report =
887
            db::hooks::CheckReport { state: &p.projected_state, name: "flow/test", status, summary: "", url: "", reporter: None, seal: "" };
888
        db::hooks::upsert_check(&app.db, row.id, report).await.unwrap();
889
        oxygenhub::hooks::emit(app, row, "check", "flow", serde_json::json!({ "check": { "state": p.projected_state } })).await;
890
    };
891
    let state_of = |number: i64| async move {
892
        for _ in 0..100 {
893
            let p = db::proposals::get(&app.db, row.id, number).await.unwrap().unwrap();
894
            if p.state != "open" || p.auto_land_by.is_empty() {
895
                return p;
896
            }
897
            tokio::time::sleep(std::time::Duration::from_millis(50)).await;
898
        }
899
        db::proposals::get(&app.db, row.id, number).await.unwrap().unwrap()
900
    };
901
902
    // #1: set while its check is pending; it waits, then lands as Andy.
903
    let page = get(app, "/andy/demo/proposal/1", Some(&andy)).await;
904
    assert!(page.body.contains("LAND WHEN CHECKS PASS"), "{}", page.body);
905
    let r = act(app, "/andy/demo/proposal/1/auto-land", Some(&andy), &format!("_csrf={}&on=1", csrf_of(&page.body))).await;
906
    assert!(r.body.contains("lands when its checks pass (set by"), "{}", r.body);
907
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "open", "the check has not passed");
908
    check(1, "running").await;
909
    tokio::time::sleep(std::time::Duration::from_millis(200)).await;
910
    assert_eq!(db::proposals::get(&app.db, row.id, 1).await.unwrap().unwrap().state, "open", "still running");
911
    check(1, "passed").await;
912
    let p = state_of(1).await;
913
    assert_eq!((p.state.as_str(), p.landed_by.as_str()), ("landed", "andy"));
914
    assert!(p.landed_via.contains("when its checks passed (set by andy)"), "{}", p.landed_via);
915
916
    // #2: a failing check turns it off, with a note; it stays open.
917
    let page = get(app, "/andy/demo/proposal/2", Some(&andy)).await;
918
    act(app, "/andy/demo/proposal/2/auto-land", Some(&andy), &format!("_csrf={}&on=1", csrf_of(&page.body))).await;
919
    check(2, "failed").await;
920
    let p = state_of(2).await;
921
    assert_eq!((p.state.as_str(), p.auto_land_by.as_str()), ("open", ""));
922
    let page = get(app, "/andy/demo/proposal/2", Some(&andy)).await;
923
    assert!(page.body.contains("turned off landing when its checks pass") && page.body.contains("flow/test did not pass"), "{}", page.body);
924
    // Set again and turned off by hand.
925
    act(app, "/andy/demo/proposal/2/auto-land", Some(&andy), &format!("_csrf={}&on=1", csrf_of(&page.body))).await;
926
    let page = get(app, "/andy/demo/proposal/2", Some(&andy)).await;
927
    let r = act(app, "/andy/demo/proposal/2/auto-land", Some(&andy), &format!("_csrf={}&on=0", csrf_of(&page.body))).await;
928
    assert!(r.body.contains("will not land by itself"), "{}", r.body);
929
    assert!(db::proposals::get(&app.db, row.id, 2).await.unwrap().unwrap().auto_land_by.is_empty());
930
}
931
acc85ac0 Andy McCall ↶ 932
/// Metal Gear 2's finding: a landed proposal's "Closes #N" closed nothing,
933
/// because only changes a push imports were read. Changes that arrive on
934
/// the default bookmark close issues however they get there.
935
#[tokio::test(flavor = "multi_thread")]
936
async fn closes_in_a_landed_change_closes_the_issue() {
937
    let h = hub().await;
938
    let app = &h.app;
939
    let andy = register(app, "andy").await;
940
    let repo = RepoName::parse("andy/demo").unwrap();
941
    app.repos.create(&repo, None).unwrap();
942
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
943
    let json = |method: &'static str, path: String, body: &'static str| async move {
944
        let res = oxygenhub::router(app.clone())
945
            .oneshot(
946
                Request::builder()
947
                    .method(method)
948
                    .uri(path)
949
                    .header(header::AUTHORIZATION, "Bearer site")
950
                    .header(header::CONTENT_TYPE, "application/json")
951
                    .body(Body::from(body))
952
                    .unwrap(),
953
            )
954
            .await
955
            .unwrap();
956
        let st = res.status();
957
        (st, String::from_utf8_lossy(&res.into_body().collect().await.unwrap().to_bytes()).into_owned())
958
    };
959
    for t in ["one", "two"] {
960
        let body: &'static str = if t == "one" { r#"{"title":"one"}"# } else { r#"{"title":"two"}"# };
961
        let (st, b) = json("POST", "/api/v1/repos/andy/demo/issues".into(), body).await;
962
        assert_eq!(st, StatusCode::CREATED, "{b}");
963
    }
964
    let work = tempfile::tempdir().unwrap();
965
    let mut client = Repo::init(work.path()).unwrap();
966
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
967
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
968
    client.config.set("remote.origin.token", "site").unwrap();
969
    client.save_config().unwrap();
970
    write(work.path(), "a.txt", b"one\n");
971
    client.snapshot("t").unwrap();
972
    let base = client.commit("base", &[]).unwrap();
973
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
974
    client.bookmark_create("feature", Some(&[base])).unwrap();
975
    client.bookmark_switch("feature", false).unwrap();
976
    write(work.path(), "b.txt", b"b\n");
977
    client.snapshot("t").unwrap();
978
    client.commit("add b\n\nCloses #1", &[]).unwrap();
979
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
980
    let state = |n: i64| async move { db::issues::get(&app.db, 1, n).await.unwrap().unwrap().state };
981
    assert_eq!(state(1).await, "open", "a push to another bookmark closes nothing");
982
983
    // Landed on the hub: #1 closes.
984
    let preview = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await;
985
    let csrf = csrf_of(&preview.body);
986
    let r = post(app, "/andy/demo/proposals/new", Some(&andy), &format!("_csrf={csrf}&title=B&body=&target=main&source=feature")).await;
987
    assert_eq!(r.status, StatusCode::SEE_OTHER, "{}", r.body);
988
    let number = db::proposals::list(&app.db, 1, &["open"]).await.unwrap()[0].number;
989
    let (st, b) = json("POST", format!("/api/v1/repos/andy/demo/proposals/{number}/land"), "{}").await;
990
    assert_eq!(st, StatusCode::OK, "{b}");
991
    assert_eq!(state(1).await, "closed", "landing closes what the change says");
992
993
    // A client moving main to a change the hub already holds: #2 closes.
994
    client.bookmark_create("other", Some(&[base])).unwrap();
995
    client.bookmark_switch("other", false).unwrap();
996
    write(work.path(), "c.txt", b"c\n");
997
    client.snapshot("t").unwrap();
998
    let c = client.commit("add c, closes #2", &[]).unwrap();
999
    assert!(client.push_bookmark("origin", "other", false).unwrap().iter().all(|r| r.ok));
1000
    assert_eq!(state(2).await, "open");
1001
    let (_, list) = json("GET", "/api/v1/repos/andy/demo/bookmarks".into(), "").await;
1002
    let list: Vec<serde_json::Value> = serde_json::from_str(&list).unwrap();
1003
    let main = list.iter().find(|b| b["name"] == "main").unwrap();
1004
    let mut heads: Vec<oxy_core::hash::ChangeHash> =
1005
        main["heads"].as_array().unwrap().iter().map(|h| oxy_core::hash::ChangeHash::from_hex(h.as_str().unwrap()).unwrap()).collect();
1006
    client.fetch("origin").unwrap();
1007
    heads.push(c);
1008
    client.bookmark_set("main", &heads).unwrap();
1009
    assert!(client.push_bookmark("origin", "main", false).unwrap().iter().all(|r| r.ok));
1010
    let mut s2 = state(2).await;
1011
    for _ in 0..100 {
1012
        if s2 == "closed" {
1013
            break;
1014
        }
1015
        tokio::time::sleep(std::time::Duration::from_millis(30)).await;
1016
        s2 = state(2).await;
1017
    }
1018
    assert_eq!(s2, "closed", "a change arriving by push closes it, though the hub held it already");
1019
}
c08cec37 Andy McCall ↶ 1020
1021
/// A stand-in that refuses a prompt longer than `limit` bytes as a provider
1022
/// does when it overflows the model, and keeps each call's length.
1023
async fn mock_limited(limit: usize) -> (String, std::sync::Arc<std::sync::Mutex<Vec<usize>>>) {
1024
    use std::sync::{Arc, Mutex};
1025
    let seen: Arc<Mutex<Vec<usize>>> = Arc::new(Mutex::new(vec![]));
1026
    let s2 = seen.clone();
1027
    let router = axum::Router::new().route(
1028
        "/v1/chat/completions",
1029
        axum::routing::post(move |body: String| {
1030
            let s2 = s2.clone();
1031
            async move {
1032
                s2.lock().unwrap().push(body.len());
1033
                if body.len() > limit {
1034
                    let msg = format!("This model's maximum context length is {limit} tokens. Please reduce the length of the messages.");
1035
                    return (StatusCode::BAD_REQUEST, axum::Json(serde_json::json!({ "error": { "message": msg } })));
1036
                }
1037
                (
1038
                    StatusCode::OK,
1039
                    axum::Json(serde_json::json!({ "choices": [{ "message": { "role": "assistant", "content": "Small draft." } }] })),
1040
                )
1041
            }
1042
        }),
1043
    );
1044
    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
1045
    let port = listener.local_addr().unwrap().port();
1046
    tokio::spawn(async move { axum::serve(listener, router).await.unwrap() });
1047
    (format!("http://127.0.0.1:{port}/v1/chat/completions"), seen)
1048
}
1049
1050
/// A proposal too large for the model (oxygenhub#248): the provider refuses
1051
/// it, the hub asks again with a third of the room, and the answer comes.
1052
#[tokio::test(flavor = "multi_thread")]
1053
async fn a_proposal_too_large_for_the_model_is_asked_again_smaller() {
1054
    let h = hub().await;
1055
    let app = &h.app;
1056
    let andy = register(app, "andy").await;
1057
    let repo = RepoName::parse("andy/demo").unwrap();
1058
    app.repos.create(&repo, None).unwrap();
1059
    db::repos::create(&app.db, "andy", "demo", "", hub_api::Visibility::Public).await.unwrap();
1060
    let work = tempfile::tempdir().unwrap();
1061
    let mut client = Repo::init(work.path()).unwrap();
1062
    client.create_identity("Andy McCall", "[email protected]", oxy_core::repo::IdentityScope::User).unwrap();
1063
    client.config.set("remote.origin.url", &format!("{}/andy/demo", h.base)).unwrap();
1064
    client.config.set("remote.origin.token", "site").unwrap();
1065
    client.save_config().unwrap();
1066
    write(work.path(), "a.txt", b"one\n");
1067
    client.snapshot("t").unwrap();
1068
    let base = client.commit("base", &[]).unwrap();
1069
    assert!(client.push("origin", false).unwrap().iter().all(|r| r.ok));
1070
    client.bookmark_create("feature", Some(&[base])).unwrap();
1071
    client.bookmark_switch("feature", false).unwrap();
1072
    // A big change: 200 lines of 60 characters, about 12 KB of diff.
1073
    let big: String = (0..200).map(|i| format!("{i:04} {}\n", "x".repeat(55))).collect();
1074
    write(work.path(), "big.txt", big.as_bytes());
1075
    client.snapshot("t").unwrap();
1076
    client.commit("a big file", &[]).unwrap();
1077
    assert!(client.push_bookmark("origin", "feature", false).unwrap().iter().all(|r| r.ok));
1078
1079
    let (endpoint, seen) = mock_limited(6_000).await;
1080
    let admin = get(app, "/admin", Some(&andy)).await.body;
1081
    let ep = endpoint.replace(':', "%3A").replace('/', "%2F");
1082
    let r = post(
1083
        app,
1084
        "/admin/assistants",
1085
        Some(&andy),
1086
        &format!(
1087
            "_csrf={}&action=add&name=Small&endpoint={ep}&api=chat-completions&model=small-1&token=sk-test&enabled=1&budget=12000",
1088
            csrf_of(&admin)
1089
        ),
1090
    )
1091
    .await;
1092
    assert!(r.body.contains("Small added and answered"), "{}", r.body);
1093
    seen.lock().unwrap().clear();
1094
    let page = get(app, "/andy/demo/proposals/new?source=feature&target=main", Some(&andy)).await.body;
1095
    let r = post(
1096
        app,
1097
        "/andy/demo/proposals/new/draft",
1098
        Some(&andy),
1099
        &format!("_csrf={}&title=Big&body=&target=main&source=feature&assistant=Small", csrf_of(&page)),
1100
    )
1101
    .await;
1102
    assert_eq!(r.status, StatusCode::OK, "{}", r.body);
1103
    assert!(r.body.contains("Small draft."), "{}", r.body);
1104
    let calls = seen.lock().unwrap().clone();
1105
    assert_eq!(calls.len(), 2, "refused once, then asked smaller: {calls:?}");
1106
    assert!(calls[0] > 6_000 && calls[1] <= 6_000, "{calls:?}");
1107
}