Added tests for CrateNotFound and VersionNotFound errors

Author: robinhundt

src/web/error.rs

@@ -113,11 +113,37 @@ mod tests {
     use kuchiki::traits::TendrilSink;
 
     #[test]
-    fn check_404_page_content() {
+    fn check_404_page_content_crate() {
         wrapper(|env| {
             let page = kuchiki::parse_html().one(
                 env.frontend()
-                    .get("/page-which-doesnt-exist")
+                    .get("/crate-which-doesnt-exist")
+                    .send()?
+                    .text()?,
+            );
+            assert_eq!(page.select("#crate-title").unwrap().count(), 1);
+            assert_eq!(
+                page.select("#crate-title")
+                    .unwrap()
+                    .next()
+                    .unwrap()
+                    .text_contents(),
+                "The requested crate does not exist",
+            );
+
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn check_404_page_content_resource() {
+        // Resources with a `.js` and `.ico` extension are special cased in the
+        // routes_handler which is currently run last. This means that `get("resource.exe")` will
+        // fail with a `no so such crate` instead of 'no such resource'
+        wrapper(|env| {
+            let page = kuchiki::parse_html().one(
+                env.frontend()
+                    .get("/resource-which-doesnt-exist.js")
                     .send()?
                     .text()?,
             );
@@ -134,4 +160,66 @@ mod tests {
             Ok(())
         });
     }
+
+    #[test]
+    fn check_404_page_content_not_semver_version() {
+        wrapper(|env| {
+            env.fake_release().name("dummy").create()?;
+            let page =
+                kuchiki::parse_html().one(env.frontend().get("/dummy/not-semver").send()?.text()?);
+            assert_eq!(page.select("#crate-title").unwrap().count(), 1);
+            assert_eq!(
+                page.select("#crate-title")
+                    .unwrap()
+                    .next()
+                    .unwrap()
+                    .text_contents(),
+                "The requested version does not exist",
+            );
+
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn check_404_page_content_nonexistent_version() {
+        wrapper(|env| {
+            env.fake_release().name("dummy").version("1.0.0").create()?;
+            let page = kuchiki::parse_html().one(env.frontend().get("/dummy/2.0").send()?.text()?);
+            assert_eq!(page.select("#crate-title").unwrap().count(), 1);
+            assert_eq!(
+                page.select("#crate-title")
+                    .unwrap()
+                    .next()
+                    .unwrap()
+                    .text_contents(),
+                "The requested version does not exist",
+            );
+
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn check_404_page_content_any_version_all_yanked() {
+        wrapper(|env| {
+            env.fake_release()
+                .name("dummy")
+                .version("1.0.0")
+                .yanked(true)
+                .create()?;
+            let page = kuchiki::parse_html().one(env.frontend().get("/dummy/*").send()?.text()?);
+            assert_eq!(page.select("#crate-title").unwrap().count(), 1);
+            assert_eq!(
+                page.select("#crate-title")
+                    .unwrap()
+                    .next()
+                    .unwrap()
+                    .text_contents(),
+                "The requested version does not exist",
+            );
+
+            Ok(())
+        });
+    }
 }

src/web/mod.rs

@@ -346,18 +346,17 @@ fn match_version(
         let mut versions_sem: Vec<(Version, i32)> = Vec::with_capacity(versions.len());
 
         for version in versions.iter().filter(|(_, _, yanked)| !yanked) {
-            // in theory a crate must always have a semver compatible version, but check result just in case
-            versions_sem.push((
-                Version::parse(&version.0).map_err(|_| {
-                    log::error!(
-                        "invalid semver in database for crate {}: {}",
-                        name,
-                        version.0
-                    );
-                    Nope::InternalServerError
-                })?,
-                version.1,
-            ));
+            // in theory a crate must always have a semver compatible version,
+            // but check result just in case
+            let version_sem = Version::parse(&version.0).map_err(|_| {
+                log::error!(
+                    "invalid semver in database for crate {}: {}",
+                    name,
+                    version.0
+                );
+                Nope::InternalServerError
+            })?;
+            versions_sem.push((version_sem, version.1));
         }
 
         versions_sem.sort();
@@ -375,7 +374,7 @@ fn match_version(
         });
     }
 
-    // semver is acting weird for '*' (any) range if a crate only have pre-release versions
+    // semver is acting weird for '*' (any) range if a crate only has pre-release versions
     // return first non-yanked version if requested version is '*'
     if req_version == "*" {
         return versions_sem