summaryrefslogtreecommitdiff
path: root/cli/tests/integration/watcher_tests.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2021-11-01 16:22:08 -0400
committerGitHub <noreply@github.com>2021-11-01 16:22:08 -0400
commit2794d0b7a29dc2c84438f5004dd35d00d6d29007 (patch)
tree966bcc5a6163014868443f028c1397082635cd50 /cli/tests/integration/watcher_tests.rs
parentb92019a8475a16213028ab73b15be5a3f7c56e0a (diff)
fix(fmt/lint): strip unc paths on Windows when displaying file paths in lint and fmt (#12606)
Diffstat (limited to 'cli/tests/integration/watcher_tests.rs')
-rw-r--r--cli/tests/integration/watcher_tests.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/cli/tests/integration/watcher_tests.rs b/cli/tests/integration/watcher_tests.rs
index a71d6bd51..42ca4b520 100644
--- a/cli/tests/integration/watcher_tests.rs
+++ b/cli/tests/integration/watcher_tests.rs
@@ -116,7 +116,7 @@ fn lint_watch_test() {
let mut output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// Change content of the file again to be badly-linted1
std::fs::copy(&badly_linted_fixed1, &badly_linted)
@@ -125,7 +125,7 @@ fn lint_watch_test() {
output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_fixed1_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// Change content of the file again to be badly-linted1
std::fs::copy(&badly_linted_fixed2, &badly_linted)
@@ -134,7 +134,7 @@ fn lint_watch_test() {
output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_fixed2_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// the watcher process is still alive
assert!(child.try_wait().unwrap().is_none());
@@ -182,7 +182,7 @@ fn lint_watch_without_args_test() {
let mut output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// Change content of the file again to be badly-linted1
std::fs::copy(&badly_linted_fixed1, &badly_linted)
@@ -191,7 +191,7 @@ fn lint_watch_without_args_test() {
output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_fixed1_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// Change content of the file again to be badly-linted1
std::fs::copy(&badly_linted_fixed2, &badly_linted)
@@ -200,7 +200,7 @@ fn lint_watch_without_args_test() {
output = read_all_lints(&mut stderr_lines);
let expected = std::fs::read_to_string(badly_linted_fixed2_output).unwrap();
- assert_eq!(expected, output);
+ assert_eq!(output, expected);
// the watcher process is still alive
assert!(child.try_wait().unwrap().is_none());
@@ -285,7 +285,7 @@ fn fmt_watch_test() {
let expected = std::fs::read_to_string(fixed.clone()).unwrap();
let actual = std::fs::read_to_string(badly_formatted.clone()).unwrap();
- assert_eq!(expected, actual);
+ assert_eq!(actual, expected);
// Change content of the file again to be badly formatted
std::fs::copy(&badly_formatted_original, &badly_formatted).unwrap();
@@ -294,7 +294,7 @@ fn fmt_watch_test() {
// Check if file has been automatically formatted by watcher
let expected = std::fs::read_to_string(fixed).unwrap();
let actual = std::fs::read_to_string(badly_formatted).unwrap();
- assert_eq!(expected, actual);
+ assert_eq!(actual, expected);
check_alive_then_kill(child);
}
@@ -325,7 +325,7 @@ fn fmt_watch_without_args_test() {
let expected = std::fs::read_to_string(fixed.clone()).unwrap();
let actual = std::fs::read_to_string(badly_formatted.clone()).unwrap();
- assert_eq!(expected, actual);
+ assert_eq!(actual, expected);
// Change content of the file again to be badly formatted
std::fs::copy(&badly_formatted_original, &badly_formatted).unwrap();
@@ -334,7 +334,7 @@ fn fmt_watch_without_args_test() {
// Check if file has been automatically formatted by watcher
let expected = std::fs::read_to_string(fixed).unwrap();
let actual = std::fs::read_to_string(badly_formatted).unwrap();
- assert_eq!(expected, actual);
+ assert_eq!(actual, expected);
check_alive_then_kill(child);
}