ilyagr.bsky.social
just playing with tangled
tests: port test_builtin_aliases.rs to TestWorkDir API
The local work_dir is created by caller since it borrows &test_env.
+43
-42
+43
-42
cli/tests/test_builtin_aliases.rs
+43
-42
cli/tests/test_builtin_aliases.rs
···
12
12
// See the License for the specific language governing permissions and
13
13
// limitations under the License.
14
14
15
-
use std::path::PathBuf;
16
-
17
15
use crate::common::TestEnvironment;
18
16
19
-
fn set_up(trunk_name: &str) -> (TestEnvironment, PathBuf) {
17
+
fn set_up(trunk_name: &str) -> TestEnvironment {
20
18
let test_env = TestEnvironment::default();
21
19
test_env.run_jj_in(".", ["git", "init", "origin"]).success();
22
-
let origin_path = test_env.env_root().join("origin");
23
-
let origin_git_repo_path = origin_path
20
+
let origin_dir = test_env.work_dir("origin");
21
+
let origin_git_repo_path = origin_dir
22
+
.root()
24
23
.join(".jj")
25
24
.join("repo")
26
25
.join("store")
27
26
.join("git");
28
27
29
-
test_env
30
-
.run_jj_in(&origin_path, ["describe", "-m=description 1"])
28
+
origin_dir
29
+
.run_jj(["describe", "-m=description 1"])
31
30
.success();
32
-
test_env
33
-
.run_jj_in(&origin_path, ["bookmark", "create", "-r@", trunk_name])
31
+
origin_dir
32
+
.run_jj(["bookmark", "create", "-r@", trunk_name])
34
33
.success();
35
-
test_env
36
-
.run_jj_in(&origin_path, ["new", "root()", "-m=description 2"])
34
+
origin_dir
35
+
.run_jj(["new", "root()", "-m=description 2"])
37
36
.success();
38
-
test_env
39
-
.run_jj_in(
40
-
&origin_path,
41
-
["bookmark", "create", "-r@", "unrelated_bookmark"],
42
-
)
37
+
origin_dir
38
+
.run_jj(["bookmark", "create", "-r@", "unrelated_bookmark"])
43
39
.success();
44
-
test_env
45
-
.run_jj_in(&origin_path, ["git", "export"])
46
-
.success();
40
+
origin_dir.run_jj(["git", "export"]).success();
47
41
48
42
test_env
49
43
.run_jj_in(
···
57
51
],
58
52
)
59
53
.success();
60
-
let workspace_root = test_env.env_root().join("local");
61
-
(test_env, workspace_root)
54
+
test_env
62
55
}
63
56
64
57
#[test]
65
58
fn test_builtin_alias_trunk_matches_main() {
66
-
let (test_env, workspace_root) = set_up("main");
59
+
let test_env = set_up("main");
60
+
let work_dir = test_env.work_dir("local");
67
61
68
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
62
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
69
63
insta::assert_snapshot!(output, @r"
70
64
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
71
65
│ (empty) description 1
···
76
70
77
71
#[test]
78
72
fn test_builtin_alias_trunk_matches_master() {
79
-
let (test_env, workspace_root) = set_up("master");
73
+
let test_env = set_up("master");
74
+
let work_dir = test_env.work_dir("local");
80
75
81
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
76
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
82
77
insta::assert_snapshot!(output, @r"
83
78
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 master d13ecdbd
84
79
│ (empty) description 1
···
89
84
90
85
#[test]
91
86
fn test_builtin_alias_trunk_matches_trunk() {
92
-
let (test_env, workspace_root) = set_up("trunk");
87
+
let test_env = set_up("trunk");
88
+
let work_dir = test_env.work_dir("local");
93
89
94
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
90
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
95
91
insta::assert_snapshot!(output, @r"
96
92
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 trunk d13ecdbd
97
93
│ (empty) description 1
···
102
98
103
99
#[test]
104
100
fn test_builtin_alias_trunk_matches_exactly_one_commit() {
105
-
let (test_env, workspace_root) = set_up("main");
106
-
let origin_path = test_env.env_root().join("origin");
107
-
test_env
108
-
.run_jj_in(&origin_path, ["new", "root()", "-m=description 3"])
101
+
let test_env = set_up("main");
102
+
let work_dir = test_env.work_dir("local");
103
+
let origin_dir = test_env.work_dir("origin");
104
+
origin_dir
105
+
.run_jj(["new", "root()", "-m=description 3"])
109
106
.success();
110
-
test_env
111
-
.run_jj_in(&origin_path, ["bookmark", "create", "-r@", "master"])
107
+
origin_dir
108
+
.run_jj(["bookmark", "create", "-r@", "master"])
112
109
.success();
113
110
114
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
111
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
115
112
insta::assert_snapshot!(output, @r"
116
113
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
117
114
│ (empty) description 1
···
122
119
123
120
#[test]
124
121
fn test_builtin_alias_trunk_override_alias() {
125
-
let (test_env, workspace_root) = set_up("override-trunk");
122
+
let test_env = set_up("override-trunk");
123
+
let work_dir = test_env.work_dir("local");
126
124
127
125
test_env.add_config(
128
126
r#"revset-aliases.'trunk()' = 'latest(remote_bookmarks(exact:"override-trunk", exact:"origin"))'"#,
129
127
);
130
128
131
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
129
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
132
130
insta::assert_snapshot!(output, @r"
133
131
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 override-trunk d13ecdbd
134
132
│ (empty) description 1
···
139
137
140
138
#[test]
141
139
fn test_builtin_alias_trunk_no_match() {
142
-
let (test_env, workspace_root) = set_up("no-match-trunk");
140
+
let test_env = set_up("no-match-trunk");
141
+
let work_dir = test_env.work_dir("local");
143
142
144
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
143
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
145
144
insta::assert_snapshot!(output, @r"
146
145
◆ zzzzzzzz root() 00000000
147
146
[EOF]
···
150
149
151
150
#[test]
152
151
fn test_builtin_alias_trunk_no_match_only_exact() {
153
-
let (test_env, workspace_root) = set_up("maint");
152
+
let test_env = set_up("maint");
153
+
let work_dir = test_env.work_dir("local");
154
154
155
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
155
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
156
156
insta::assert_snapshot!(output, @r"
157
157
◆ zzzzzzzz root() 00000000
158
158
[EOF]
···
161
161
162
162
#[test]
163
163
fn test_builtin_user_redefines_builtin_immutable_heads() {
164
-
let (test_env, workspace_root) = set_up("main");
164
+
let test_env = set_up("main");
165
+
let work_dir = test_env.work_dir("local");
165
166
166
167
test_env.add_config(r#"revset-aliases.'builtin_immutable_heads()' = '@'"#);
167
168
test_env.add_config(r#"revset-aliases.'mutable()' = '@'"#);
168
169
test_env.add_config(r#"revset-aliases.'immutable()' = '@'"#);
169
170
170
-
let output = test_env.run_jj_in(&workspace_root, ["log", "-r", "trunk()"]);
171
+
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
171
172
insta::assert_snapshot!(output, @r"
172
173
○ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
173
174
│ (empty) description 1