From dfff2fd6345e60d659eafce90f193c4273c4289f Mon Sep 17 00:00:00 2001
From: William <william.hng@outlook.com>
Date: Fri, 8 Feb 2019 16:30:45 +0100
Subject: [PATCH] Optimized the unit test & added fixed info to the CHANGES.md

---
 CHANGES.md | 4 ++++
 src/fs.rs  | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 83803abb0..1a18e092f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,10 @@
 
 * Add `from_file` and `from_file_with_config` to `NamedFile` to allow sending files without a known path. #670
 
+### Fixed
+
+* Ignored the `If-Modified-Since` if `If-None-Match` is specified. #680
+
 ## [0.7.18] - 2019-01-10
 
 ### Added
diff --git a/src/fs.rs b/src/fs.rs
index 3e1305e14..e99892f65 100644
--- a/src/fs.rs
+++ b/src/fs.rs
@@ -969,17 +969,9 @@ mod tests {
 
     #[test]
     fn test_if_modified_since_ignored() {
-        assert!(NamedFile::open("test--").is_err());
         let mut file = NamedFile::open("Cargo.toml")
             .unwrap()
             .set_cpu_pool(CpuPool::new(1));
-        {
-            file.file();
-            let _f: &File = &file;
-        }
-        {
-            let _f: &mut File = &mut file;
-        }
         let since = header::HttpDate::from(
             SystemTime::now().add(Duration::from_secs(60)));