Fix rustdoc files for FakeRelease

rustdoc files and source files are different

Author: jyn514

src/test/fakes.rs

@@ -3,14 +3,16 @@ use crate::db::CratesIoData;
 use crate::docbuilder::BuildResult;
 use crate::utils::{Dependency, MetadataPackage, Target};
 use failure::Error;
-use rustc_serialize::json::Json;
 
 #[must_use = "FakeRelease does nothing until you call .create()"]
 pub(crate) struct FakeRelease<'db> {
     db: &'db TestDatabase,
     package: MetadataPackage,
     build_result: BuildResult,
-    files: Vec<(String, String, Vec<u8>)>,
+    /// name, content
+    source_files: Vec<(String, Vec<u8>)>,
+    /// name, content
+    rustdoc_files: Vec<(String, Vec<u8>)>,
     doc_targets: Vec<String>,
     default_target: Option<String>,
     cratesio_data: CratesIoData,
@@ -47,7 +49,8 @@ impl<'db> FakeRelease<'db> {
                 build_log: "It works!".into(),
                 successful: true,
             },
-            files: Vec::new(),
+            source_files: Vec::new(),
+            rustdoc_files: Vec::new(),
             doc_targets: Vec::new(),
             default_target: None,
             cratesio_data: CratesIoData {
@@ -92,22 +95,40 @@ impl<'db> FakeRelease<'db> {
         self
     }
 
+    pub(crate) fn rustdoc_file<P, D>(mut self, path: P, data: D) -> Self
+        where P: Into<String>,
+              D: Into<Vec<u8>>,
+        {
+        let (path, data) = (path.into(), data.into());
+        self.rustdoc_files.push((path, data));
+
+        self
+    }
+
     pub(crate) fn create(self) -> Result<i32, Error> {
         let tempdir = tempdir::TempDir::new("docs.rs-fake")?;
 
-        let files: Vec<_> = self.files.into_iter().map(|(mimetype, path, data)| {
-            let file = tempdir.path().join(&path);
-            std::fs::write(file, data)?;
+        let upload_files = |prefix, files: Vec<(String, Vec<u8>)>, package: &MetadataPackage, db: &TestDatabase| {
+            for (path, data) in files {
+                let file = tempdir.path().join(&path);
+                std::fs::write(file, data)?;
+            }
 
-            Ok(Json::Array(vec![Json::String(mimetype), Json::String(path)]))
-        }).collect::<Result<_, Error>>()?;
+            let prefix = format!("{}/{}/{}", prefix, package.name, package.version);
+            crate::db::add_path_into_database(&db.conn(), &prefix, tempdir.path())
+        };
+
+        let rustdoc_meta = upload_files("rustdoc", self.rustdoc_files, &self.package, self.db)?;
+        log::debug!("added rustdoc files {}", rustdoc_meta);
+        let source_meta = upload_files("source", self.source_files, &self.package, self.db)?;
+        log::debug!("added source files {}", source_meta);
 
         let release_id = crate::db::add_package_into_database(
             &self.db.conn(),
             &self.package,
             tempdir.path(),
             &self.build_result,
-            if files.is_empty() { None } else { Some(Json::Array(files)) },
+            Some(source_meta),
             self.doc_targets,
             &self.default_target,
             &self.cratesio_data,
@@ -116,10 +137,6 @@ impl<'db> FakeRelease<'db> {
         )?;
         crate::db::add_build_into_database(&self.db.conn(), &release_id, &self.build_result)?;
 
-        let prefix = format!("rustdoc/{}/{}", self.package.name, self.package.version);
-        let added_files = crate::db::add_path_into_database(&self.db.conn(), &prefix, tempdir.path())?;
-        log::debug!("added files {}", added_files);
-
         Ok(release_id)
     }
 }

src/web/rustdoc.rs

@@ -425,8 +425,8 @@ mod test {
             db.fake_release()
               .name("buggy").version("0.1.0")
               .build_result_successful(true)
-              .file("text/html", "settings.html", "some data")
-              .file("text/html", "all.html", "some data 2")
+              .rustdoc_file("settings.html", "some data")
+              .rustdoc_file("all.html", "some data 2")
               .create()?;
             db.fake_release()
               .name("buggy").version("0.2.0")