Skip to content

Commit 1969fdd

Browse files
cruesslercruessler
committed
Use suffix to match on path in snapshots
1 parent c11ba5d commit 1969fdd

File tree

5 files changed

+53
-45
lines changed

5 files changed

+53
-45
lines changed

‎git2-testing/src/lib.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@ pub fn repo_init_empty() -> (TempDir, Repository) {
1818
(td, repo)
1919
}
2020

21-
/// initialize test repo in temp path with an empty first commit
22-
pub fn repo_init() -> (TempDir, Repository) {
21+
/// initialize test repo in temp path with given suffix and an empty first commit
22+
pub fn repo_init_suffix<T: AsRef<std::ffi::OsStr>>(
23+
suffix: Option<T>,
24+
) -> (TempDir, Repository) {
2325
init_log();
2426

2527
sandbox_config_files();
2628

27-
let td = TempDir::new().unwrap();
29+
let td = match suffix {
30+
Some(suffix) => TempDir::with_suffix(suffix).unwrap(),
31+
None => TempDir::new().unwrap(),
32+
};
2833
let repo = Repository::init(td.path()).unwrap();
2934
{
3035
let mut config = repo.config().unwrap();
@@ -43,6 +48,11 @@ pub fn repo_init() -> (TempDir, Repository) {
4348
(td, repo)
4449
}
4550

51+
/// initialize test repo in temp path with an empty first commit
52+
pub fn repo_init() -> (TempDir, Repository) {
53+
repo_init_suffix::<&std::ffi::OsStr>(None)
54+
}
55+
4656
// init log
4757
fn init_log() {
4858
let _ = env_logger::builder()

‎src/gitui.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ impl Gitui {
152152

153153
#[cfg(test)]
154154
fn update_async(&mut self, event: crate::AsyncNotification) {
155-
dbg!(event);
156155
self.app.update_async(event).unwrap();
157156
}
158157

@@ -199,7 +198,7 @@ mod tests {
199198

200199
use asyncgit::{sync::RepoPath, AsyncGitNotification};
201200
use crossterm::event::{KeyCode, KeyModifiers};
202-
use git2_testing::repo_init;
201+
use git2_testing::repo_init_suffix;
203202
use insta::assert_snapshot;
204203
use ratatui::{backend::TestBackend, Terminal};
205204

@@ -212,12 +211,11 @@ mod tests {
212211
macro_rules! apply_common_filters {
213212
{} => {
214213
let mut settings = insta::Settings::clone_current();
215-
// MacOS Temp Folder
216-
settings.add_filter(r" *\[…\]\S+?/T/\S+", "[TEMP_FILE]");
214+
// Windows and MacOS
215+
// We don't match on the full path, but on the suffix we pass to `repo_init_suffix` below.
216+
settings.add_filter(r" *\[…\]\S+-insta/?", "[TEMP_FILE]");
217217
// Linux Temp Folder
218-
settings.add_filter(r" */tmp/\.tmp\S+", "[TEMP_FILE]");
219-
// Windows Temp folder
220-
settings.add_filter(r" *\[…\].*/Local/Temp/\S+", "[TEMP_FILE]");
218+
settings.add_filter(r" */tmp/\.tmp\S+-insta/", "[TEMP_FILE]");
221219
// Commit ids that follow a vertical bar
222220
settings.add_filter(r"│[a-z0-9]{7} ", "│[AAAAA] ");
223221
let _bound = settings.bind_to_scope();
@@ -228,7 +226,7 @@ mod tests {
228226
fn gitui_starts() {
229227
apply_common_filters!();
230228

231-
let (temp_dir, _repo) = repo_init();
229+
let (temp_dir, _repo) = repo_init_suffix(Some("-insta"));
232230
let path: RepoPath = temp_dir.path().to_str().unwrap().into();
233231

234232
let theme = Theme::init(&PathBuf::new());
@@ -239,7 +237,7 @@ mod tests {
239237
.unwrap();
240238

241239
let mut terminal =
242-
Terminal::new(TestBackend::new(120, 12)).unwrap();
240+
Terminal::new(TestBackend::new(90, 12)).unwrap();
243241

244242
gitui.draw(&mut terminal).unwrap();
245243

‎src/snapshots/gitui__gitui__tests__app_loading.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ expression: terminal.backend()
44
snapshot_kind: text
55
---
66
" Status [1] | Log [2] | Files [3] | Stashing [4] | Stashes [5][TEMP_FILE] "
7-
" ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── "
8-
"┌Unstaged Changes──────────────────────────────────────────┐┌Diff: ────────────────────────────────────────────────────┐"
9-
"│Loading ... ││ │"
10-
"│ ││ │"
11-
"│ ││ │"
12-
"└──────────────────────────────────────────────────{master}┘│ │"
13-
"┌Staged Changes────────────────────────────────────────────┐│ │"
14-
"│Loading ... ││ │"
15-
"│ ││ │"
16-
"└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘"
17-
" "
7+
" ──────────────────────────────────────────────────────────────────────────────────────── "
8+
"┌Unstaged Changes───────────────────────────┐┌Diff: ─────────────────────────────────────┐"
9+
"│Loading ... ││ │"
10+
"│ ││ │"
11+
"│ ││ │"
12+
"└───────────────────────────────────{master}┘│ │"
13+
"┌Staged Changes─────────────────────────────┐│ │"
14+
"│Loading ... ││ │"
15+
"│ ││ │"
16+
"└───────────────────────────────────────────┘└───────────────────────────────────────────┘"
17+
" "

‎src/snapshots/gitui__gitui__tests__app_loading_finished.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ expression: terminal.backend()
44
snapshot_kind: text
55
---
66
" Status [1] | Log [2] | Files [3] | Stashing [4] | Stashes [5][TEMP_FILE] "
7-
" ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── "
8-
"┌Unstaged Changes──────────────────────────────────────────┐┌Diff: ────────────────────────────────────────────────────┐"
9-
"│ ││ │"
10-
"│ ││ │"
11-
"│ ││ │"
12-
"└──────────────────────────────────────────────────{master}┘│ │"
13-
"┌Staged Changes────────────────────────────────────────────┐│ │"
14-
"│ ││ │"
15-
"│ ││ │"
16-
"└──────────────────────────────────────────────────────────┘└──────────────────────────────────────────────────────────┘"
17-
"Branches [b] Push [p] Fetch [⇧F] Pull [f] Undo Commit [⇧U] Submodules [⇧S] Nav [↑↓→←] Diff [→] To stage [w] more [.]"
7+
" ──────────────────────────────────────────────────────────────────────────────────────── "
8+
"┌Unstaged Changes───────────────────────────┐┌Diff: ─────────────────────────────────────┐"
9+
"│ ││ │"
10+
"│ ││ │"
11+
"│ ││ │"
12+
"└───────────────────────────────────{master}┘│ │"
13+
"┌Staged Changes─────────────────────────────┐│ │"
14+
"│ ││ │"
15+
"│ ││ │"
16+
"└───────────────────────────────────────────┘└───────────────────────────────────────────┘"
17+
"Branches [b] Push [p] Fetch [⇧F] Pull [f] Undo Commit [⇧U] Submodules [⇧S] more [.]"

‎src/snapshots/gitui__gitui__tests__app_log_tab_showing_one_commit.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ expression: terminal.backend()
44
snapshot_kind: text
55
---
66
" Status [1] | Log [2] | Files [3] | Stashing [4] | Stashes [5][TEMP_FILE] "
7-
" ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── "
8-
"┌Commit 1/1────────────────────────────────────────────────────────────────────────────────────────────────────────────┐"
9-
"│[AAAAA] <1m ago name initial █"
10-
"│ ║"
11-
"│ ║"
12-
"│ ║"
13-
"│ ║"
14-
"│ ║"
15-
"│ ║"
16-
"└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘"
17-
"Scroll [↑↓] Mark [˽] Details [⏎] Branches [b] Compare [⇧C] Copy Hash [y] Tag [t] Checkout [⇧S] Tags [⇧T] more [.]"
7+
" ──────────────────────────────────────────────────────────────────────────────────────── "
8+
"┌Commit 1/1──────────────────────────────────────────────────────────────────────────────┐"
9+
"│[AAAAA] <1m ago name initial █"
10+
"│ ║"
11+
"│ ║"
12+
"│ ║"
13+
"│ ║"
14+
"│ ║"
15+
"│ ║"
16+
"└────────────────────────────────────────────────────────────────────────────────────────┘"
17+
"Scroll [↑↓] Mark [˽] Details [⏎] Branches [b] Compare [⇧C] Copy Hash [y] Tag [t] more [.]"

0 commit comments

Comments
 (0)