Skip to content

Commit 20a12b6

Browse files
epageepage
committed
chore: Upgrade snapbox to 0.6
1 parent c4123d8 commit 20a12b6

File tree

5 files changed

+159
-131
lines changed

5 files changed

+159
-131
lines changed

‎Cargo.lock

Lines changed: 2 additions & 2 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.14", features = ["cmd", "dir"] }
148+
snapbox = { version = "0.6.0", features = ["cmd", "dir"] }
149149
automod = "1.0.14"
150150

151151
[profile.dev]

‎tests/testsuite/alias.rs

Lines changed: 87 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,19 @@ fn list_no_config() {
2222
.assert()
2323
.success()
2424
.stdout_eq_(str![[r#"
25-
[alias]
26-
# next = stack next # unregistered
27-
# prev = stack previous # unregistered
28-
# reword = stack reword # unregistered
29-
# amend = stack amend # unregistered
30-
# sync = stack sync # unregistered
31-
# run = stack run # unregistered
32-
"#]].raw())
25+
[alias]
26+
# next = stack next # unregistered
27+
# prev = stack previous # unregistered
28+
# reword = stack reword # unregistered
29+
# amend = stack amend # unregistered
30+
# sync = stack sync # unregistered
31+
# run = stack run # unregistered
32+
33+
"#]].raw())
3334
.stderr_eq_(str![[r#"
34-
note: To register, pass `--register`
35-
"#]]);
35+
note: To register, pass `--register`
36+
37+
"#]]);
3638

3739
root.close().unwrap();
3840
}
@@ -63,17 +65,19 @@ fn list_global_config() {
6365
.assert()
6466
.success()
6567
.stdout_eq_(str![[r#"
66-
[alias]
67-
next = foo # instead of `stack next`
68-
# prev = stack previous # unregistered
69-
# reword = stack reword # unregistered
70-
# amend = stack amend # unregistered
71-
# sync = stack sync # unregistered
72-
# run = stack run # unregistered
73-
"#]].raw())
68+
[alias]
69+
next = foo # instead of `stack next`
70+
# prev = stack previous # unregistered
71+
# reword = stack reword # unregistered
72+
# amend = stack amend # unregistered
73+
# sync = stack sync # unregistered
74+
# run = stack run # unregistered
75+
76+
"#]].raw())
7477
.stderr_eq_(str![[r#"
75-
note: To register, pass `--register`
76-
"#]]);
78+
note: To register, pass `--register`
79+
80+
"#]]);
7781

7882
root.close().unwrap();
7983
}
@@ -98,13 +102,14 @@ fn register_no_config() {
98102
.success()
99103
.stdout_eq_(str![].raw())
100104
.stderr_eq_(str![[r#"
101-
Registering: next="stack next"
102-
Registering: prev="stack previous"
103-
Registering: reword="stack reword"
104-
Registering: amend="stack amend"
105-
Registering: sync="stack sync"
106-
Registering: run="stack run"
107-
"#]]);
105+
Registering: next="stack next"
106+
Registering: prev="stack previous"
107+
Registering: reword="stack reword"
108+
Registering: amend="stack amend"
109+
Registering: sync="stack sync"
110+
Registering: run="stack run"
111+
112+
"#]]);
108113

109114
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
110115
.arg("alias")
@@ -113,17 +118,19 @@ fn register_no_config() {
113118
.assert()
114119
.success()
115120
.stdout_eq_(str![[r#"
116-
[alias]
117-
next = stack next # registered
118-
prev = stack previous # registered
119-
reword = stack reword # registered
120-
amend = stack amend # registered
121-
sync = stack sync # registered
122-
run = stack run # registered
123-
"#]].raw())
121+
[alias]
122+
next = stack next # registered
123+
prev = stack previous # registered
124+
reword = stack reword # registered
125+
amend = stack amend # registered
126+
sync = stack sync # registered
127+
run = stack run # registered
128+
129+
"#]].raw())
124130
.stderr_eq_(str![[r#"
125-
note: To unregister, pass `--unregister`
126-
"#]]);
131+
note: To unregister, pass `--unregister`
132+
133+
"#]]);
127134

128135
root.close().unwrap();
129136
}
@@ -157,12 +164,13 @@ fn register_no_overwrite_alias() {
157164
.failure()
158165
.stdout_eq_(str![].raw())
159166
.stderr_eq_(str![[r#"
160-
error: next="foo" is registered, not overwriting with "stack next"
161-
Registering: reword="stack reword"
162-
Registering: amend="stack amend"
163-
Registering: sync="stack sync"
164-
Registering: run="stack run"
165-
"#]]);
167+
error: next="foo" is registered, not overwriting with "stack next"
168+
Registering: reword="stack reword"
169+
Registering: amend="stack amend"
170+
Registering: sync="stack sync"
171+
Registering: run="stack run"
172+
173+
"#]]);
166174

167175
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
168176
.arg("alias")
@@ -171,17 +179,19 @@ fn register_no_overwrite_alias() {
171179
.assert()
172180
.success()
173181
.stdout_eq_(str![[r#"
174-
[alias]
175-
next = foo # instead of `stack next`
176-
prev = stack previous -v # diverged from "stack previous"
177-
reword = stack reword # registered
178-
amend = stack amend # registered
179-
sync = stack sync # registered
180-
run = stack run # registered
181-
"#]].raw())
182+
[alias]
183+
next = foo # instead of `stack next`
184+
prev = stack previous -v # diverged from "stack previous"
185+
reword = stack reword # registered
186+
amend = stack amend # registered
187+
sync = stack sync # registered
188+
run = stack run # registered
189+
190+
"#]].raw())
182191
.stderr_eq_(str![[r#"
183-
note: To unregister, pass `--unregister`
184-
"#]]);
192+
note: To unregister, pass `--unregister`
193+
194+
"#]]);
185195

186196
root.close().unwrap();
187197
}
@@ -214,13 +224,14 @@ fn register_unregister() {
214224
.success()
215225
.stdout_eq_(str![])
216226
.stderr_eq_(str![[r#"
217-
Unregistering: next="stack next"
218-
Unregistering: prev="stack previous"
219-
Unregistering: reword="stack reword"
220-
Unregistering: amend="stack amend"
221-
Unregistering: sync="stack sync"
222-
Unregistering: run="stack run"
223-
"#]]);
227+
Unregistering: next="stack next"
228+
Unregistering: prev="stack previous"
229+
Unregistering: reword="stack reword"
230+
Unregistering: amend="stack amend"
231+
Unregistering: sync="stack sync"
232+
Unregistering: run="stack run"
233+
234+
"#]]);
224235

225236
root.close().unwrap();
226237
}
@@ -311,9 +322,10 @@ fn unregister_existing_config() {
311322
.success()
312323
.stdout_eq_(str![].raw())
313324
.stderr_eq_(str![[r#"
314-
Unregistering: prev="stack previous -v"
315-
Unregistering: reword="stack reword"
316-
"#]]);
325+
Unregistering: prev="stack previous -v"
326+
Unregistering: reword="stack reword"
327+
328+
"#]]);
317329

318330
snapbox::cmd::Command::new(snapbox::cmd::cargo_bin!("git-stack"))
319331
.arg("alias")
@@ -322,17 +334,19 @@ fn unregister_existing_config() {
322334
.assert()
323335
.success()
324336
.stdout_eq_(str![[r#"
325-
[alias]
326-
next = foo # instead of `stack next`
327-
# prev = stack previous # unregistered
328-
# reword = stack reword # unregistered
329-
# amend = stack amend # unregistered
330-
# sync = stack sync # unregistered
331-
# run = stack run # unregistered
332-
"#]].raw())
337+
[alias]
338+
next = foo # instead of `stack next`
339+
# prev = stack previous # unregistered
340+
# reword = stack reword # unregistered
341+
# amend = stack amend # unregistered
342+
# sync = stack sync # unregistered
343+
# run = stack run # unregistered
344+
345+
"#]].raw())
333346
.stderr_eq_(str![[r#"
334-
note: To register, pass `--register`
335-
"#]]);
347+
note: To register, pass `--register`
348+
349+
"#]]);
336350

337351
root.close().unwrap();
338352
}

0 commit comments

Comments
 (0)