Merge pull request #204 from rage/deps

Updated deps, renamed argument

Author: Heliozoa

Cargo.lock

@@ -24,7 +24,7 @@ env_logger = "0.10.0"
 serde = "1.0.136"
 serde_json = "1.0.78"
 thiserror = "1.0.30"
-ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "d1eeeabc857b824f3cdaec97270c33d3cf0eda35", features = [
+ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "6a7866228b008bab4bb03604fb404193fcbe7f74", features = [
     "serde-compat",
 ] }
 

crates/bindings/tmc-langs-node/Cargo.toml

@@ -421,7 +421,7 @@ test("sample", c("r1.1"), {
                 }
             }
         }
-        panic!()
+        panic!("did not time out")
     }
 
     #[test]

crates/plugins/r/src/plugin.rs

@@ -29,15 +29,15 @@ serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 tempfile = "3.3.0"
 thiserror = "1.0.30"
-ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "d1eeeabc857b824f3cdaec97270c33d3cf0eda35", features = [
+ts-rs = { git = "https://github.com/Heliozoa/ts-rs.git", rev = "6a7866228b008bab4bb03604fb404193fcbe7f74", features = [
     "serde-compat",
 ], optional = true }
 url = "2.2.2"
 walkdir = "2.3.2"
 
 [dev-dependencies]
 dotenv = "0.15.0"
-mockito = "0.31.0"
+mockito = "0.32.0"
 simple_logger = "4.0.0"
 
 [features]

crates/tmc-client/Cargo.toml

@@ -625,7 +625,7 @@ fn finish_stage(message: impl Into<String>, data: impl Into<Option<ClientUpdateD
 mod test {
     // many of TmcClient's functions simply call already tested functions from api_v8 and don't need testing
     use super::*;
-    use mockito::Matcher;
+    use mockito::{Matcher, Server};
     use oauth2::{basic::BasicTokenType, AccessToken, EmptyExtraTokenFields};
     use std::sync::atomic::AtomicBool;
 
@@ -645,9 +645,9 @@ mod test {
             .init();
     }
 
-    fn make_client() -> TmcClient {
+    fn make_client(server: &Server) -> TmcClient {
         let mut client = TmcClient::new(
-            mockito::server_url().parse().unwrap(),
+            server.url().parse().unwrap(),
             "some_client".to_string(),
             "some_ver".to_string(),
         );
@@ -663,8 +663,9 @@ mod test {
     #[test]
     fn gets_exercise_updates() {
         init();
-        let client = make_client();
-        let _m = mockito::mock("GET", "/api/v8/core/courses/1234")
+        let mut server = Server::new();
+        let client = make_client(&server);
+        let _m = server.mock("GET", "/api/v8/core/courses/1234")
             .match_query(Matcher::AllOf(vec![
                 Matcher::UrlEncoded("client".into(), "some_client".into()),
                 Matcher::UrlEncoded("client_version".into(), "some_ver".into()),
@@ -772,9 +773,10 @@ mod test {
     #[test]
     fn waits_for_submission() {
         init();
-
-        let client = make_client();
-        let m = mockito::mock("GET", "/api/v8/core/submission/0")
+        let mut server = Server::new();
+        let client = make_client(&server);
+        let m = server
+            .mock("GET", "/api/v8/core/submission/0")
             .match_query(Matcher::AllOf(vec![
                 Matcher::UrlEncoded("client".into(), "some_client".into()),
                 Matcher::UrlEncoded("client_version".into(), "some_ver".into()),