Skip to content

Commit 82dd114

Browse files
committed
refactor
- `cargo fmt`
1 parent 32f10b6 commit 82dd114

File tree

1 file changed

+90
-87
lines changed

1 file changed

+90
-87
lines changed

crates/gitbutler-forge/src/review.rs

Lines changed: 90 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -176,120 +176,123 @@ mod tests {
176176

177177
use super::*;
178178

179+
fn p(path: &str) -> &Path {
180+
Path::new(path)
181+
}
182+
179183
#[test]
180184
fn test_is_valid_review_template_path_github() {
181-
let valid_review_template_path_1 = Path::new(".github/PULL_REQUEST_TEMPLATE.md");
182-
let valid_review_template_path_2 = Path::new(".github/pull_request_template.md");
183-
let valid_review_template_path_3 = Path::new(".github/PULL_REQUEST_TEMPLATE/something.md");
184-
let valid_review_template_path_4 = Path::new(".docs/PULL_REQUEST_TEMPLATE.md");
185-
let valid_review_template_path_5 = Path::new("PULL_REQUEST_TEMPLATE.md");
186-
let invalid_review_template_path = Path::new("README.md");
187-
188-
assert!(is_valid_review_template_path_github(
189-
valid_review_template_path_1,
190-
));
191-
assert!(is_valid_review_template_path_github(
192-
valid_review_template_path_2,
193-
));
194-
assert!(is_valid_review_template_path_github(
195-
valid_review_template_path_3,
196-
));
197-
assert!(is_valid_review_template_path_github(
198-
valid_review_template_path_4,
199-
));
200-
assert!(is_valid_review_template_path_github(
201-
valid_review_template_path_5,
202-
));
203-
assert!(!is_valid_review_template_path_github(
204-
invalid_review_template_path,
205-
));
185+
assert!(is_valid_review_template_path_github(p(
186+
".github/PULL_REQUEST_TEMPLATE.md"
187+
)));
188+
assert!(is_valid_review_template_path_github(p(
189+
".github/pull_request_template.md"
190+
)));
191+
assert!(is_valid_review_template_path_github(p(
192+
".github/PULL_REQUEST_TEMPLATE/something.md"
193+
)));
194+
assert!(is_valid_review_template_path_github(p(
195+
".docs/PULL_REQUEST_TEMPLATE.md"
196+
)));
197+
assert!(is_valid_review_template_path_github(p(
198+
"PULL_REQUEST_TEMPLATE.md"
199+
)));
200+
assert!(!is_valid_review_template_path_github(p("README.md"),));
206201
}
207202

208203
#[test]
209204
fn test_is_valid_review_template_path_github_windows() {
210-
let valid_review_template_path_1 = Path::new(".github\\PULL_REQUEST_TEMPLATE.md");
211-
let valid_review_template_path_2 = Path::new(".github\\pull_request_template.md");
212-
let valid_review_template_path_3 =
213-
Path::new(".github\\PULL_REQUEST_TEMPLATE\\something.md");
214-
let valid_review_template_path_4 = Path::new(".docs\\PULL_REQUEST_TEMPLATE.md");
215-
let valid_review_template_path_5 = Path::new("PULL_REQUEST_TEMPLATE.md");
216-
let invalid_review_template_path = Path::new("README.md");
217-
218-
assert!(is_valid_review_template_path_github(
219-
valid_review_template_path_1,
220-
));
221-
assert!(is_valid_review_template_path_github(
222-
valid_review_template_path_2,
223-
));
224-
assert!(is_valid_review_template_path_github(
225-
valid_review_template_path_3,
226-
));
227-
assert!(is_valid_review_template_path_github(
228-
valid_review_template_path_4,
229-
));
230-
assert!(is_valid_review_template_path_github(
231-
valid_review_template_path_5,
232-
));
233-
assert!(!is_valid_review_template_path_github(
234-
invalid_review_template_path,
235-
));
205+
assert!(is_valid_review_template_path_github(p(
206+
".github\\PULL_REQUEST_TEMPLATE.md"
207+
),));
208+
assert!(is_valid_review_template_path_github(p(
209+
".github\\pull_request_template.md"
210+
),));
211+
assert!(is_valid_review_template_path_github(p(
212+
".github\\PULL_REQUEST_TEMPLATE\\something.md"
213+
),));
214+
assert!(is_valid_review_template_path_github(p(
215+
".docs\\PULL_REQUEST_TEMPLATE.md"
216+
),));
217+
assert!(is_valid_review_template_path_github(p(
218+
"PULL_REQUEST_TEMPLATE.md"
219+
),));
220+
assert!(!is_valid_review_template_path_github(p("README.md"),));
236221
}
237222

238223
#[test]
239224
fn test_is_valid_review_template_path_gitlab() {
240-
let valid_review_template_path_1 = Path::new(".gitlab/merge_request_templates/Default.md");
241-
let valid_review_template_path_2 = Path::new(".gitlab/merge_request_templates/Documentation.md");
242-
let valid_review_template_path_3 = Path::new(".gitlab/merge_request_templates/Security Fix.md");
243-
let invalid_review_template_path_1 = Path::new("README.md");
244-
let invalid_review_template_path_2 = Path::new(".gitlab/issue_templates/Bug.md");
245-
let invalid_review_template_path_3 = Path::new(".gitlab/merge_request_templates/Default.txt");
246-
247-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_1));
248-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_2));
249-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_3));
250-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_1));
251-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_2));
252-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_3));
225+
assert!(is_valid_review_template_path_gitlab(p(
226+
".gitlab/merge_request_templates/Default.md"
227+
)));
228+
assert!(is_valid_review_template_path_gitlab(p(
229+
".gitlab/merge_request_templates/Documentation.md"
230+
)));
231+
assert!(is_valid_review_template_path_gitlab(p(
232+
".gitlab/merge_request_templates/Security Fix.md"
233+
)));
234+
assert!(!is_valid_review_template_path_gitlab(p("README.md")));
235+
assert!(!is_valid_review_template_path_gitlab(p(
236+
".gitlab/issue_templates/Bug.md"
237+
)));
238+
assert!(!is_valid_review_template_path_gitlab(p(
239+
".gitlab/merge_request_templates/Default.txt"
240+
)));
253241
}
254242

255243
#[test]
256244
fn test_is_valid_review_template_path_gitlab_windows() {
257-
let valid_review_template_path_1 = Path::new(".gitlab\\merge_request_templates\\Default.md");
258-
let valid_review_template_path_2 = Path::new(".gitlab\\merge_request_templates\\Documentation.md");
259-
let valid_review_template_path_3 = Path::new(".gitlab\\merge_request_templates\\Security Fix.md");
260-
let invalid_review_template_path_1 = Path::new("README.md");
261-
let invalid_review_template_path_2 = Path::new(".gitlab\\issue_templates\\Bug.md");
262-
let invalid_review_template_path_3 = Path::new(".gitlab\\merge_request_templates\\Default.txt");
263-
264-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_1));
265-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_2));
266-
assert!(is_valid_review_template_path_gitlab(valid_review_template_path_3));
267-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_1));
268-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_2));
269-
assert!(!is_valid_review_template_path_gitlab(invalid_review_template_path_3));
245+
assert!(is_valid_review_template_path_gitlab(p(
246+
".gitlab\\merge_request_templates\\Default.md"
247+
)));
248+
assert!(is_valid_review_template_path_gitlab(p(
249+
".gitlab\\merge_request_templates\\Documentation.md"
250+
)));
251+
assert!(is_valid_review_template_path_gitlab(p(
252+
".gitlab\\merge_request_templates\\Security Fix.md"
253+
)));
254+
assert!(!is_valid_review_template_path_gitlab(p("README.md")));
255+
assert!(!is_valid_review_template_path_gitlab(p(
256+
".gitlab\\issue_templates\\Bug.md"
257+
)));
258+
assert!(!is_valid_review_template_path_gitlab(p(
259+
".gitlab\\merge_request_templates\\Default.txt"
260+
)));
270261
}
271262

272263
#[test]
273264
fn test_get_gitlab_directory_path() {
274-
let root_path = Path::new("/path/to/project");
265+
let root_path = p("/path/to/project");
275266
let gitlab_path = get_gitlab_directory_path(root_path);
276-
assert_eq!(gitlab_path, Path::new("/path/to/project/.gitlab"));
267+
assert_eq!(gitlab_path, p("/path/to/project/.gitlab"));
277268
}
278269

279270
#[test]
280271
fn test_is_review_template_gitlab() {
281272
// Valid GitLab merge request templates
282-
assert!(is_review_template_gitlab(".gitlab/merge_request_templates/Default.md"));
283-
assert!(is_review_template_gitlab(".gitlab/merge_request_templates/Documentation.md"));
284-
assert!(is_review_template_gitlab(".gitlab/merge_request_templates/Security Fix.md"));
285-
273+
assert!(is_review_template_gitlab(
274+
".gitlab/merge_request_templates/Default.md"
275+
));
276+
assert!(is_review_template_gitlab(
277+
".gitlab/merge_request_templates/Documentation.md"
278+
));
279+
assert!(is_review_template_gitlab(
280+
".gitlab/merge_request_templates/Security Fix.md"
281+
));
282+
286283
// Invalid paths
287284
assert!(!is_review_template_gitlab("README.md"));
288285
assert!(!is_review_template_gitlab(".gitlab/issue_templates/Bug.md"));
289-
assert!(!is_review_template_gitlab(".gitlab/merge_request_templates/Default.txt"));
290-
assert!(!is_review_template_gitlab("merge_request_templates/Default.md"));
291-
286+
assert!(!is_review_template_gitlab(
287+
".gitlab/merge_request_templates/Default.txt"
288+
));
289+
assert!(!is_review_template_gitlab(
290+
"merge_request_templates/Default.md"
291+
));
292+
292293
// Windows path separators should work
293-
assert!(is_review_template_gitlab(".gitlab\\merge_request_templates\\Default.md"));
294+
assert!(is_review_template_gitlab(
295+
".gitlab\\merge_request_templates\\Default.md"
296+
));
294297
}
295298
}

0 commit comments

Comments
 (0)