From 4840c7cd78910d54a7959d8d0d4187ca84d90c2d Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Thu, 28 May 2020 09:43:51 -0500
Subject: [PATCH] Tests ~ add predicate normalization for tests using `echo`

---
 Cargo.toml                 | 1 +
 tests/integration_tests.rs | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b53b11b7..949375bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,6 +76,7 @@ default-features = false
 [dev-dependencies]
 tempdir = "0.3"
 assert_cmd = "1.0.1"
+predicates = "1.0.4"
 
 [build-dependencies]
 clap = { version = "2.33", optional = true }
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index f10221ec..b5236342 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -1,4 +1,5 @@
 use assert_cmd::Command;
+use predicates::{prelude::predicate,str::PredicateStrExt};
 use std::path::Path;
 use std::str::from_utf8;
 
@@ -454,7 +455,7 @@ fn pager_basic() {
     println!("stdout={:#?}", stdout);
     assert
         .success()
-        .stdout("pager-output\n");
+        .stdout(predicate::eq("pager-output\n").normalize());
 }
 
 #[test]
@@ -469,7 +470,7 @@ fn pager_overwrite() {
     println!("stdout={:#?}", stdout);
     assert
         .success()
-        .stdout("pager-output\n");
+        .stdout(predicate::eq("pager-output\n").normalize());
 }
 
 #[test]
@@ -484,7 +485,7 @@ fn pager_disable() {
     println!("stdout={:#?}", stdout);
     assert
         .success()
-        .stdout("hello world\n");
+        .stdout(predicate::eq("hello world\n").normalize());
 }
 
 #[test]
@@ -510,7 +511,7 @@ fn config_read_arguments_from_file() {
     println!("stdout={:#?}", stdout);
     assert
         .success()
-        .stdout("dummy-pager-from-config\n");
+        .stdout(predicate::eq("dummy-pager-from-config\n").normalize());
 }
 
 #[test]