Fixed some bitrot and removed the (now redundant) tests/helper module

Author: Michael-F-Bryan

tests/dummy/mod.rs

@@ -15,8 +15,8 @@ use std::error::Error;
 // The funny `self::` here is because we've got an `extern crate ...` and are
 // in a submodule
 use self::tempdir::TempDir;
-use self::walkdir::WalkDir;
 use self::mdbook::MDBook;
+use self::walkdir::WalkDir;
 
 
 const SUMMARY_MD: &'static str = include_str!("book/SUMMARY.md");
@@ -94,6 +94,18 @@ impl Default for DummyBook {
 }
 
 
+/// Copy the example book to a temporary directory and build it.
+pub fn build_example_book() -> TempDir {
+    let temp = TempDir::new("mdbook").expect("Couldn't create a temporary directory");
+    let book_root = Path::new(env!("CARGO_MANIFEST_DIR")).join("book-example");
+
+    recursive_copy(&book_root, temp.path()).expect("Couldn't copy the book example to a temporary directory");
+
+    let book = MDBook::new(temp.path()).build().expect("Building failed");
+    temp
+}
+
+
 /// Read the contents of the provided file into memory and then iterate through
 /// the list of strings asserting that the file contains all of them.
 pub fn assert_contains_strings<P: AsRef<Path>>(filename: P, strings: &[&str]) {
@@ -111,17 +123,6 @@ pub fn assert_contains_strings<P: AsRef<Path>>(filename: P, strings: &[&str]) {
 }
 
 
-/// Copy the example book to a temporary directory and build it.
-pub fn build_example_book() -> TempDir {
-    let temp = TempDir::new("mdbook").expect("Couldn't create a temporary directory");
-    let book_root = Path::new(env!("CARGO_MANIFEST_DIR")).join("book-example");
-
-    recursive_copy(&book_root, temp.path()).expect("Couldn't copy the book example to a temporary directory");
-
-    let book = MDBook::new(temp.path()).build().expect("Building failed");
-    temp
-}
-
 
 /// Recursively copy an entire directory tree to somewhere else (a la `cp -r`).
 fn recursive_copy<A: AsRef<Path>, B: AsRef<Path>>(from: A, to: B) -> Result<(), Box<Error>> {

tests/helpers/mod.rs

@@ -7,19 +7,17 @@
 //! Hopefully Travis will let you know when that happens.
 
 
-extern crate mdbook;
 #[macro_use]
 extern crate pretty_assertions;
 extern crate select;
-extern crate tempdir;
 extern crate walkdir;
 
-mod helpers;
+mod dummy;
 
 use std::path::Path;
 use walkdir::{DirEntry, WalkDir, WalkDirIterator};
 use select::document::Document;
-use select::predicate::{Class, Descendant, Name, Predicate};
+use select::predicate::{Class, Name, Predicate};
 
 
 const BOOK_ROOT: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/book-example");
@@ -60,7 +58,7 @@ macro_rules! descendants {
 /// and placed in the `book` directory with their extensions set to `*.html`.
 #[test]
 fn chapter_files_were_rendered_to_html() {
-    let temp = helpers::build_example_book();
+    let temp = dummy::build_example_book();
     let src = Path::new(BOOK_ROOT).join("src");
 
     let chapter_files = WalkDir::new(&src)
@@ -85,10 +83,10 @@ fn entry_ends_with(entry: &DirEntry, ending: &str) -> bool {
 /// Read the main page (`book/index.html`) and expose it as a DOM which we
 /// can search with the `select` crate
 fn root_index_html() -> Document {
-    let temp = helpers::build_example_book();
+    let temp = dummy::build_example_book();
 
     let index_page = temp.path().join("book").join("index.html");
-    let html = helpers::read_file(&index_page).unwrap();
+    let html = dummy::read_file(&index_page).unwrap();
     Document::from(html.as_str())
 }
 

tests/regression.rs

@@ -1,11 +1,8 @@
 extern crate mdbook;
-extern crate tempdir;
 
 mod dummy;
-mod helpers;
 
-use dummy::DummyBook;
-use helpers::assert_contains_strings;
+use dummy::{DummyBook, assert_contains_strings};
 use mdbook::MDBook;
 
 

tests/rendered_output.rs

@@ -1,5 +1,4 @@
 extern crate mdbook;
-extern crate tempdir;
 
 mod dummy;