stack-pr/tests/test_land.py at 20e0dc9ccf669e5ba5a76b6bdc7c1a5ebe45e879 · modular/stack-pr · GitHub

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
import sys
from pathlib import Path
from types import SimpleNamespace

sys.path.append(str(Path(__file__).parent.parent / "src"))

from stack_pr import cli


def make_args() -> cli.CommonArgs:
    return cli.CommonArgs(
        base="base",
        head="head",
        remote="origin",
        target="main",
        hyperlinks=False,
        verbose=False,
        branch_name_template="$USERNAME/stack/$ID",
        show_tips=False,
        land_disabled=False,
    )


def make_entry(head: str, pr: str, commit_id: str) -> SimpleNamespace:
    return SimpleNamespace(
        head=head,
        pr=pr,
        commit=SimpleNamespace(commit_id=lambda: commit_id),
    )


def test_land_rebases_current_branch_onto_updated_stack_tip(
    monkeypatch,
) -> None:
    commands: list[list[str]] = []
    stack = [make_entry("stack/1", "pr-1", "commit-1"), make_entry("stack/2", "pr-2", "commit-2")]

    monkeypatch.setattr(cli, "get_current_branch_name", lambda: "feature")
    monkeypatch.setattr(cli, "should_update_local_base", lambda **kwargs: False)
    monkeypatch.setattr(cli, "get_stack", lambda **kwargs: stack)
    monkeypatch.setattr(cli, "set_base_branches", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "print_stack", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "verify", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "land_pr", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "rebase_pr", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "delete_local_branches", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "branch_exists", lambda branch: False)
    monkeypatch.setattr(
        cli,
        "get_command_output",
        lambda cmd, **kwargs: "rebased-stack-tip\n"
        if cmd == ["git", "rev-parse", "stack/2"]
        else "",
    )
    monkeypatch.setattr(
        cli,
        "is_ancestor",
        lambda ancestor, descendant, *, verbose: ancestor == "commit-2"
        and descendant == "feature",
    )

    def fake_run_shell_command(cmd, *, quiet, check=True, **kwargs):
        commands.append(list(cmd))
        return SimpleNamespace(returncode=0, stdout=b"", stderr=b"")

    monkeypatch.setattr(cli, "run_shell_command", fake_run_shell_command)

    cli.command_land(make_args())

    assert [
        "git",
        "rebase",
        "rebased-stack-tip",
        "feature",
        "--committer-date-is-author-date",
    ] in commands
    assert ["git", "rebase", "stack/2", "feature", "--committer-date-is-author-date"] not in commands
    assert ["git", "rebase", "origin/main", "feature"] not in commands


def test_land_refreshes_remote_target_before_rebasing_current_branch(
    monkeypatch,
) -> None:
    commands: list[list[str]] = []
    stack = [make_entry("stack/1", "pr-1", "commit-1")]

    monkeypatch.setattr(cli, "get_current_branch_name", lambda: "feature")
    monkeypatch.setattr(cli, "should_update_local_base", lambda **kwargs: False)
    monkeypatch.setattr(cli, "get_stack", lambda **kwargs: stack)
    monkeypatch.setattr(cli, "set_base_branches", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "print_stack", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "verify", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "land_pr", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "delete_local_branches", lambda *args, **kwargs: None)
    monkeypatch.setattr(cli, "branch_exists", lambda branch: False)
    monkeypatch.setattr(
        cli,
        "is_ancestor",
        lambda ancestor, descendant, *, verbose: ancestor == "commit-1"
        and descendant == "feature",
    )

    def fake_run_shell_command(cmd, *, quiet, check=True, **kwargs):
        commands.append(list(cmd))
        return SimpleNamespace(returncode=0, stdout=b"", stderr=b"")

    monkeypatch.setattr(cli, "run_shell_command", fake_run_shell_command)

    cli.command_land(make_args())

    assert ["git", "fetch", "--prune", "origin"] in commands
    assert ["git", "rebase", "origin/main", "feature", "--committer-date-is-author-date"] in commands