From 8aa4ae43022889a93231cb8566c70d9239a80be5 Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana@gelez.xyz>
Date: Sat, 29 Aug 2020 17:26:12 +0200
Subject: [PATCH] Make tests compile again

---
 plume-models/plume.db-journal           | Bin 512 -> 0 bytes
 plume-models/plume_tests.sqlite-journal | Bin 512 -> 0 bytes
 plume-models/src/lib.rs                 |   3 +++
 plume-models/src/plume_rocket.rs        |   4 ++++
 plume-models/src/search/mod.rs          |   2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 plume-models/plume.db-journal
 delete mode 100644 plume-models/plume_tests.sqlite-journal

diff --git a/plume-models/plume.db-journal b/plume-models/plume.db-journal
deleted file mode 100644
index 2a40935dd94b2dfbdf6d5bdb1b613cc126a25a58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
bcmZQzK!6zQ2ksCa6Oa->NQ|<EZ3qAWh^Yb5

diff --git a/plume-models/plume_tests.sqlite-journal b/plume-models/plume_tests.sqlite-journal
deleted file mode 100644
index 624b437f31fc09cb71d094549fec14c340c46434..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
bcmZQzK!CDUH^L!2CLkq%kQikR+YkT%qg?`G

diff --git a/plume-models/src/lib.rs b/plume-models/src/lib.rs
index f77f8d44..7245ea06 100644
--- a/plume-models/src/lib.rs
+++ b/plume-models/src/lib.rs
@@ -330,6 +330,9 @@ mod tests {
             searcher: Arc::new(search::tests::get_searcher(&CONFIG.search_tokenizers)),
             worker: Arc::new(ScheduledThreadPool::new(2)),
             user: None,
+            actors: Arc::new(
+                riker::actors::ActorSystem::new().expect("Couldn't create test actor system"),
+            ),
         }
     }
 }
diff --git a/plume-models/src/plume_rocket.rs b/plume-models/src/plume_rocket.rs
index 34b60688..a07f04db 100644
--- a/plume-models/src/plume_rocket.rs
+++ b/plume-models/src/plume_rocket.rs
@@ -49,6 +49,7 @@ mod module {
 #[cfg(test)]
 mod module {
     use crate::{db_conn::DbConn, search, users};
+    use riker::actors::ActorSystem;
     use rocket::{
         request::{self, FromRequest, Request},
         Outcome, State,
@@ -62,6 +63,7 @@ mod module {
         pub user: Option<users::User>,
         pub searcher: Arc<search::Searcher>,
         pub worker: Arc<ScheduledThreadPool>,
+        pub actors: Arc<ActorSystem>,
     }
 
     impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket {
@@ -72,11 +74,13 @@ mod module {
             let user = request.guard::<users::User>().succeeded();
             let worker = request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>()?;
             let searcher = request.guard::<'_, State<'_, Arc<search::Searcher>>>()?;
+            let actors = request.guard::<'_, State<'_, Arc<ActorSystem>>>()?;
             Outcome::Success(PlumeRocket {
                 conn,
                 user,
                 worker: worker.clone(),
                 searcher: searcher.clone(),
+                actors: actors.clone(),
             })
         }
     }
diff --git a/plume-models/src/search/mod.rs b/plume-models/src/search/mod.rs
index 5f9e485b..ef0b9992 100644
--- a/plume-models/src/search/mod.rs
+++ b/plume-models/src/search/mod.rs
@@ -165,7 +165,7 @@ pub(crate) mod tests {
 
             let newtitle = random_hex()[..8].to_owned();
             post.title = newtitle.clone();
-            post.update(conn, &searcher).unwrap();
+            post.update(conn).unwrap();
             searcher.commit();
             assert_eq!(
                 searcher.search_document(Query::from_str(&newtitle).unwrap(), (0, 1))[0].id,