upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests/ngit_pr_checkout.rs
blob: b0e37ebd65ed87ad02469391353dca2ef57861ac (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
use anyhow::Result;
use futures::join;
use serial_test::serial;
use test_utils::{git::GitTestRepo, relay::Relay, *};

/// Run `ngit pr list --json --offline` in `dir` and return the nevent id for
/// the proposal whose branch-name matches `branch_name_in_event`.
#[allow(deprecated)]
fn get_proposal_id_for_branch(dir: &std::path::Path, branch_name_in_event: &str) -> Result<String> {
    let output = std::process::Command::new(assert_cmd::cargo::cargo_bin("ngit"))
        .env("NGITTEST", "TRUE")
        .current_dir(dir)
        .args([
            "--nsec",
            TEST_KEY_1_NSEC,
            "--password",
            TEST_PASSWORD,
            "--disable-cli-spinners",
            "pr",
            "list",
            "--json",
            "--offline",
        ])
        .output()?;
    let stdout = String::from_utf8(output.stdout)?;
    let proposals: Vec<serde_json::Value> = serde_json::from_str(&stdout)
        .map_err(|e| anyhow::anyhow!("failed to parse pr list json: {e}\nstdout: {stdout}"))?;
    let entry = proposals
        .iter()
        .find(|p| {
            p["branch"]
                .as_str()
                .map(|b| b.starts_with(&format!("pr/{branch_name_in_event}(")))
                .unwrap_or(false)
        })
        .ok_or_else(|| {
            anyhow::anyhow!("no proposal found for branch {branch_name_in_event} in: {stdout}")
        })?;
    Ok(entry["id"].as_str().unwrap_or_default().to_string())
}

/// Run `ngit pr checkout --offline <id>` (cache must already be populated).
fn run_pr_checkout(test_repo: &GitTestRepo, branch_name_in_event: &str) -> Result<()> {
    run_pr_checkout_with_args(test_repo, branch_name_in_event, &["--offline"])
}

/// Run `ngit pr checkout --force --offline <id>` (cache must already be
/// populated).
fn run_pr_checkout_force(test_repo: &GitTestRepo, branch_name_in_event: &str) -> Result<()> {
    run_pr_checkout_with_args(test_repo, branch_name_in_event, &["--force", "--offline"])
}

#[allow(deprecated)]
fn run_pr_checkout_with_args(
    test_repo: &GitTestRepo,
    branch_name_in_event: &str,
    extra_args: &[&str],
) -> Result<()> {
    let proposal_id = get_proposal_id_for_branch(&test_repo.dir, branch_name_in_event)?;
    let mut args = vec![
        "--nsec",
        TEST_KEY_1_NSEC,
        "--password",
        TEST_PASSWORD,
        "--disable-cli-spinners",
        "pr",
        "checkout",
    ];
    args.extend_from_slice(extra_args);
    args.push(&proposal_id);
    // Use std::process::Command directly (not CliTester/rexpect) so that a
    // non-zero exit code is reliably detected without PTY timeout issues.
    let status = std::process::Command::new(assert_cmd::cargo::cargo_bin("ngit"))
        .env("NGITTEST", "TRUE")
        .current_dir(&test_repo.dir)
        .args(&args)
        .status()?;
    if status.success() {
        Ok(())
    } else {
        anyhow::bail!("ngit pr checkout exited with {status}")
    }
}

/// Spin up the standard 5-relay set used by all tests in this file.
/// Returns the five relay handles in port order (51,52,53,55,56).
#[allow(clippy::type_complexity)]
fn make_relays() -> (
    Relay<'static>,
    Relay<'static>,
    Relay<'static>,
    Relay<'static>,
    Relay<'static>,
) {
    let mut r51 = Relay::new(8051, None, None);
    let r52 = Relay::new(8052, None, None);
    let r53 = Relay::new(8053, None, None);
    let mut r55 = Relay::new(8055, None, None);
    let r56 = Relay::new(8056, None, None);

    r51.events.push(generate_test_key_1_relay_list_event());
    r51.events.push(generate_test_key_1_metadata_event("fred"));
    r51.events.push(generate_repo_ref_event());

    r55.events.push(generate_repo_ref_event());
    r55.events.push(generate_test_key_1_metadata_event("fred"));
    r55.events.push(generate_test_key_1_relay_list_event());

    (r51, r52, r53, r55, r56)
}

fn shutdown_relays() -> Result<()> {
    for port in [51u64, 52, 53, 55, 56] {
        relay::shutdown_relay(8000 + port)?;
    }
    Ok(())
}

mod when_proposal_branch_doesnt_exist {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let originating_repo = cli_tester_create_proposals()?;

                let test_repo = GitTestRepo::default();
                test_repo.populate()?;

                use_ngit_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                shutdown_relays()?;
                Ok((originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_created_with_correct_name() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        let expected_branch = get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?;
        assert!(
            test_repo
                .get_local_branch_names()?
                .contains(&expected_branch),
            "expected branch {expected_branch} to exist"
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_checked_out() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        assert_eq!(
            get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?,
            test_repo.get_checked_out_branch_name()?,
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_tip_is_most_recent_patch() -> Result<()> {
        let (originating_repo, test_repo) = prep_and_run().await?;
        assert_eq!(
            originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
            test_repo.get_tip_of_local_branch(&get_proposal_branch_name(
                &test_repo,
                FEATURE_BRANCH_NAME_1
            )?)?,
        );
        Ok(())
    }
}

mod when_proposal_branch_exists_and_is_up_to_date {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let originating_repo = cli_tester_create_proposals()?;

                let test_repo = GitTestRepo::default();
                test_repo.populate()?;

                // first checkout creates the branch
                use_ngit_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;
                test_repo.checkout("main")?;

                // second checkout: branch already exists and is up to date
                run_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                shutdown_relays()?;
                Ok((originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_checked_out() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        assert_eq!(
            get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?,
            test_repo.get_checked_out_branch_name()?,
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_tip_unchanged() -> Result<()> {
        let (originating_repo, test_repo) = prep_and_run().await?;
        assert_eq!(
            originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
            test_repo.get_tip_of_local_branch(&get_proposal_branch_name(
                &test_repo,
                FEATURE_BRANCH_NAME_1
            )?)?,
        );
        Ok(())
    }
}

mod when_proposal_branch_exists_and_is_behind {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let originating_repo = cli_tester_create_proposals()?;

                let test_repo = GitTestRepo::default();
                test_repo.populate()?;

                use_ngit_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                // wind the local branch back one commit so it's behind
                remove_latest_commit_so_proposal_branch_is_behind_and_checkout_main(&test_repo)?;

                // checkout again — should fast-forward to the latest patch
                run_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                shutdown_relays()?;
                Ok((originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_checked_out() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        assert_eq!(
            get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?,
            test_repo.get_checked_out_branch_name()?,
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_tip_is_most_recent_patch() -> Result<()> {
        let (originating_repo, test_repo) = prep_and_run().await?;
        assert_eq!(
            originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
            test_repo.get_tip_of_local_branch(&get_proposal_branch_name(
                &test_repo,
                FEATURE_BRANCH_NAME_1
            )?)?,
        );
        Ok(())
    }
}

mod when_proposal_branch_has_local_amendments {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let originating_repo = cli_tester_create_proposals()?;

                let test_repo = GitTestRepo::default();
                test_repo.populate()?;

                use_ngit_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                // amend: remove the tip and add a different commit in its place
                amend_last_commit(&test_repo, "add ammended-commit.md")?;
                test_repo.checkout("main")?;

                // checkout without --force should bail on diverged branch
                assert!(
                    run_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1).is_err(),
                    "expected checkout to fail without --force on amended branch"
                );

                shutdown_relays()?;
                Ok((originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn local_unpublished_commits_are_not_overwritten() -> Result<()> {
        let (originating_repo, test_repo) = prep_and_run().await?;
        // the local branch tip must differ from the published tip — local work
        // preserved
        assert_ne!(
            originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
            test_repo.get_tip_of_local_branch(&get_proposal_branch_name(
                &test_repo,
                FEATURE_BRANCH_NAME_1
            )?)?,
        );
        Ok(())
    }
}

mod when_proposal_branch_has_local_commits_on_top {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let originating_repo = cli_tester_create_proposals()?;

                let test_repo = GitTestRepo::default();
                test_repo.populate()?;

                use_ngit_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                // add an extra local commit on top of the proposal branch
                std::fs::write(test_repo.dir.join("local-extra.md"), "local work")?;
                test_repo.stage_and_commit("add local-extra.md")?;
                test_repo.checkout("main")?;

                // checkout again — should not discard the extra local commit
                run_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1)?;

                shutdown_relays()?;
                Ok((originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_checked_out() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        assert_eq!(
            get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?,
            test_repo.get_checked_out_branch_name()?,
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn local_commits_are_not_discarded() -> Result<()> {
        let (originating_repo, test_repo) = prep_and_run().await?;
        let branch = get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?;
        let local_tip = test_repo.get_tip_of_local_branch(&branch)?;
        let published_tip = originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?;
        // local tip must be ahead of (not equal to) the published tip
        assert_ne!(local_tip, published_tip, "local commits were discarded");
        // and the published tip must be an ancestor of the local tip
        assert!(
            test_repo
                .git_repo
                .graph_descendant_of(local_tip, published_tip)?,
            "local branch is not descended from published tip"
        );
        Ok(())
    }
}

mod when_newer_revision_rebases_proposal {
    use super::*;

    async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
        let (mut r51, mut r52, mut r53, mut r55, mut r56) = make_relays();

        let cli_tester_handle =
            std::thread::spawn(move || -> Result<(GitTestRepo, GitTestRepo)> {
                let (new_originating_repo, test_repo) =
                    create_proposals_with_rebased_first_proposal()?;

                // refresh test_repo cache so it sees the new rebased revision
                let mut p = CliTester::new_from_dir(
                    &test_repo.dir,
                    [
                        "--nsec",
                        TEST_KEY_1_NSEC,
                        "--password",
                        TEST_PASSWORD,
                        "--disable-cli-spinners",
                        "pr",
                        "list",
                    ],
                );
                p.expect_end_eventually()?;

                // checkout without --force should bail on diverged branch
                assert!(
                    run_pr_checkout(&test_repo, FEATURE_BRANCH_NAME_1).is_err(),
                    "expected checkout to fail without --force on diverged branch"
                );
                // checkout with --force should update to the new rebased revision
                // (relays still needed for the fetch inside checkout)
                run_pr_checkout_force(&test_repo, FEATURE_BRANCH_NAME_1)?;

                shutdown_relays()?;
                Ok((new_originating_repo, test_repo))
            });

        let _ = join!(
            r51.listen_until_close(),
            r52.listen_until_close(),
            r53.listen_until_close(),
            r55.listen_until_close(),
            r56.listen_until_close(),
        );
        cli_tester_handle.join().unwrap()
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_checked_out() -> Result<()> {
        let (_, test_repo) = prep_and_run().await?;
        assert_eq!(
            get_proposal_branch_name(&test_repo, FEATURE_BRANCH_NAME_1)?,
            test_repo.get_checked_out_branch_name()?,
        );
        Ok(())
    }

    #[tokio::test]
    #[serial]
    async fn proposal_branch_tip_is_most_recent_revision_tip() -> Result<()> {
        let (new_originating_repo, test_repo) = prep_and_run().await?;
        assert_eq!(
            new_originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
            test_repo.get_tip_of_local_branch(&get_proposal_branch_name(
                &test_repo,
                FEATURE_BRANCH_NAME_1
            )?)?,
        );
        Ok(())
    }
}

/// Creates 3 proposals, checks out proposal 1 in a test repo, then publishes
/// a rebased revision of proposal 1 from a second originating repo. Returns
/// (new_originating_repo, test_repo) with the test repo still on the old
/// branch.
fn create_proposals_with_rebased_first_proposal() -> Result<(GitTestRepo, GitTestRepo)> {
    // create the initial 3 proposals and check out proposal 1 in a test repo
    let (_, test_repo) =
        create_proposals_and_repo_with_proposal_branch_checked_out(FEATURE_BRANCH_NAME_1)?;

    // get the original proposal id to use as in_reply_to for the rebased revision
    let original_proposal_id = get_proposal_id_for_branch(&test_repo.dir, FEATURE_BRANCH_NAME_1)?;

    // publish a rebased revision of proposal 1 from a second originating repo
    let second_originating_repo = GitTestRepo::default();
    second_originating_repo.populate()?;
    std::fs::write(
        second_originating_repo.dir.join("amazing.md"),
        "some content",
    )?;
    second_originating_repo.stage_and_commit("commit for rebasing on top of")?;
    cli_tester_create_proposal(
        &second_originating_repo,
        FEATURE_BRANCH_NAME_1,
        "a",
        Some((PROPOSAL_TITLE_1, "proposal a description")),
        Some(original_proposal_id),
    )?;

    // simulate the test repo having pulled the updated main branch
    let branch_name = test_repo.get_checked_out_branch_name()?;
    test_repo.checkout("main")?;
    std::fs::write(test_repo.dir.join("amazing.md"), "some content")?;
    test_repo.stage_and_commit("commit for rebasing on top of")?;
    test_repo.checkout(&branch_name)?;

    Ok((second_originating_repo, test_repo))
}