Skip to content

Commit 12b2605

Browse files
epageepage
authored
Merge pull request #355 from epage/snapbox
chore: Upgrade snapbox to 0.6
2 parents 8cbbba1 + d67510e commit 12b2605

File tree

5 files changed

+227
-223
lines changed

5 files changed

+227
-223
lines changed

‎Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ shlex = "1.3.0"
145145
[dev-dependencies]
146146
git-fixture = { version = "0.3.4", features = ["yaml"] }
147147
assert_fs = "1.1.1"
148-
snapbox = { version = "0.5.9", features = ["cmd", "path"] }
148+
snapbox = { version = "0.6.0", features = ["cmd", "dir"] }
149149
automod = "1.0.14"
150150

151151
[profile.dev]

‎tests/testsuite/alias.rs

Lines changed: 71 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
// Not correctly overriding on Windows
22
#![cfg(target_os = "linux")]
33

4+
use snapbox::prelude::*;
5+
use snapbox::str;
6+
47
#[test]
58
fn list_no_config() {
6-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
9+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
710
let root_path = root.path().unwrap();
811

912
let home_root = root_path.join("home");
@@ -19,28 +22,29 @@ fn list_no_config() {
1922
.assert()
2023
.success()
2124
.stdout_eq(
22-
"\
25+
str![[r#"
2326
[alias]
2427
# next = stack next # unregistered
2528
# prev = stack previous # unregistered
2629
# reword = stack reword # unregistered
2730
# amend = stack amend # unregistered
2831
# sync = stack sync # unregistered
2932
# run = stack run # unregistered
30-
",
33+
34+
"#]]
35+
.raw(),
3136
)
32-
.stderr_matches(
33-
"\
37+
.stderr_eq(str![[r#"
3438
note: To register, pass `--register`
35-
",
36-
);
39+
40+
"#]]);
3741

3842
root.close().unwrap();
3943
}
4044

4145
#[test]
4246
fn list_global_config() {
43-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
47+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
4448
let root_path = root.path().unwrap();
4549

4650
let home_root = root_path.join("home");
@@ -64,28 +68,29 @@ fn list_global_config() {
6468
.assert()
6569
.success()
6670
.stdout_eq(
67-
"\
71+
str![[r#"
6872
[alias]
6973
next = foo # instead of `stack next`
7074
# prev = stack previous # unregistered
7175
# reword = stack reword # unregistered
7276
# amend = stack amend # unregistered
7377
# sync = stack sync # unregistered
7478
# run = stack run # unregistered
75-
",
79+
80+
"#]]
81+
.raw(),
7682
)
77-
.stderr_matches(
78-
"\
83+
.stderr_eq(str![[r#"
7984
note: To register, pass `--register`
80-
",
81-
);
85+
86+
"#]]);
8287

8388
root.close().unwrap();
8489
}
8590

8691
#[test]
8792
fn register_no_config() {
88-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
93+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
8994
let root_path = root.path().unwrap();
9095

9196
let home_root = root_path.join("home");
@@ -101,19 +106,16 @@ fn register_no_config() {
101106
.env("HOME", &home_root)
102107
.assert()
103108
.success()
104-
.stdout_eq(
105-
"\
106-
",
107-
)
108-
.stderr_matches(
109-
r#"Registering: next="stack next"
109+
.stdout_eq(str![].raw())
110+
.stderr_eq(str![[r#"
111+
Registering: next="stack next"
110112
Registering: prev="stack previous"
111113
Registering: reword="stack reword"
112114
Registering: amend="stack amend"
113115
Registering: sync="stack sync"
114116
Registering: run="stack run"
115-
"#,
116-
);
117+
118+
"#]]);
117119

118120
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
119121
.arg("alias")
@@ -122,28 +124,29 @@ Registering: run="stack run"
122124
.assert()
123125
.success()
124126
.stdout_eq(
125-
"\
127+
str![[r#"
126128
[alias]
127129
next = stack next # registered
128130
prev = stack previous # registered
129131
reword = stack reword # registered
130132
amend = stack amend # registered
131133
sync = stack sync # registered
132134
run = stack run # registered
133-
",
135+
136+
"#]]
137+
.raw(),
134138
)
135-
.stderr_matches(
136-
"\
139+
.stderr_eq(str![[r#"
137140
note: To unregister, pass `--unregister`
138-
",
139-
);
141+
142+
"#]]);
140143

141144
root.close().unwrap();
142145
}
143146

144147
#[test]
145148
fn register_no_overwrite_alias() {
146-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
149+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
147150
let root_path = root.path().unwrap();
148151

149152
let home_root = root_path.join("home");
@@ -168,18 +171,15 @@ fn register_no_overwrite_alias() {
168171
.env("HOME", &home_root)
169172
.assert()
170173
.failure()
171-
.stdout_eq(
172-
"\
173-
",
174-
)
175-
.stderr_matches(
176-
r#"error: next="foo" is registered, not overwriting with "stack next"
174+
.stdout_eq(str![].raw())
175+
.stderr_eq(str![[r#"
176+
error: next="foo" is registered, not overwriting with "stack next"
177177
Registering: reword="stack reword"
178178
Registering: amend="stack amend"
179179
Registering: sync="stack sync"
180180
Registering: run="stack run"
181-
"#,
182-
);
181+
182+
"#]]);
183183

184184
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
185185
.arg("alias")
@@ -188,27 +188,29 @@ Registering: run="stack run"
188188
.assert()
189189
.success()
190190
.stdout_eq(
191-
r#"[alias]
191+
str![[r#"
192+
[alias]
192193
next = foo # instead of `stack next`
193194
prev = stack previous -v # diverged from "stack previous"
194195
reword = stack reword # registered
195196
amend = stack amend # registered
196197
sync = stack sync # registered
197198
run = stack run # registered
198-
"#,
199+
200+
"#]]
201+
.raw(),
199202
)
200-
.stderr_matches(
201-
"\
203+
.stderr_eq(str![[r#"
202204
note: To unregister, pass `--unregister`
203-
",
204-
);
205+
206+
"#]]);
205207

206208
root.close().unwrap();
207209
}
208210

209211
#[test]
210212
fn register_unregister() {
211-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
213+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
212214
let root_path = root.path().unwrap();
213215

214216
let home_root = root_path.join("home");
@@ -232,23 +234,23 @@ fn register_unregister() {
232234
.env("HOME", &home_root)
233235
.assert()
234236
.success()
235-
.stdout_matches("")
236-
.stderr_matches(
237-
r#"Unregistering: next="stack next"
237+
.stdout_eq(str![])
238+
.stderr_eq(str![[r#"
239+
Unregistering: next="stack next"
238240
Unregistering: prev="stack previous"
239241
Unregistering: reword="stack reword"
240242
Unregistering: amend="stack amend"
241243
Unregistering: sync="stack sync"
242244
Unregistering: run="stack run"
243-
"#,
244-
);
245+
246+
"#]]);
245247

246248
root.close().unwrap();
247249
}
248250

249251
#[test]
250252
fn reregister() {
251-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
253+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
252254
let root_path = root.path().unwrap();
253255

254256
let home_root = root_path.join("home");
@@ -272,18 +274,15 @@ fn reregister() {
272274
.env("HOME", &home_root)
273275
.assert()
274276
.success()
275-
.stdout_eq(
276-
"\
277-
",
278-
)
279-
.stderr_matches(r#""#);
277+
.stdout_eq(str![].raw())
278+
.stderr_eq(str![]);
280279

281280
root.close().unwrap();
282281
}
283282

284283
#[test]
285284
fn unregister_no_config() {
286-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
285+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
287286
let root_path = root.path().unwrap();
288287

289288
let home_root = root_path.join("home");
@@ -299,18 +298,15 @@ fn unregister_no_config() {
299298
.env("HOME", &home_root)
300299
.assert()
301300
.success()
302-
.stdout_eq(
303-
"\
304-
",
305-
)
306-
.stderr_matches(r#""#);
301+
.stdout_eq(str![].raw())
302+
.stderr_eq(str![]);
307303

308304
root.close().unwrap();
309305
}
310306

311307
#[test]
312308
fn unregister_existing_config() {
313-
let root = snapbox::path::PathFixture::mutable_temp().unwrap();
309+
let root = snapbox::dir::DirRoot::mutable_temp().unwrap();
314310
let root_path = root.path().unwrap();
315311

316312
let home_root = root_path.join("home");
@@ -336,15 +332,12 @@ fn unregister_existing_config() {
336332
.env("HOME", &home_root)
337333
.assert()
338334
.success()
339-
.stdout_eq(
340-
"\
341-
",
342-
)
343-
.stderr_matches(
344-
r#"Unregistering: prev="stack previous -v"
335+
.stdout_eq(str![].raw())
336+
.stderr_eq(str![[r#"
337+
Unregistering: prev="stack previous -v"
345338
Unregistering: reword="stack reword"
346-
"#,
347-
);
339+
340+
"#]]);
348341

349342
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
350343
.arg("alias")
@@ -353,21 +346,22 @@ Unregistering: reword="stack reword"
353346
.assert()
354347
.success()
355348
.stdout_eq(
356-
"\
349+
str![[r#"
357350
[alias]
358351
next = foo # instead of `stack next`
359352
# prev = stack previous # unregistered
360353
# reword = stack reword # unregistered
361354
# amend = stack amend # unregistered
362355
# sync = stack sync # unregistered
363356
# run = stack run # unregistered
364-
",
357+
358+
"#]]
359+
.raw(),
365360
)
366-
.stderr_matches(
367-
"\
361+
.stderr_eq(str![[r#"
368362
note: To register, pass `--register`
369-
",
370-
);
363+
364+
"#]]);
371365

372366
root.close().unwrap();
373367
}

0 commit comments

Comments
 (0)