2 files changed, 21 insertions(+), 11 deletions(-)

M Cargo.toml
M tests/tests.rs

@@ 17,31 17,29 @@ path = "src/bin/kiwi.rs"
 chrono = "0.4"
 derive_builder = "0.10"
 dirs-next = "2.0"
-lua-patterns = "0.3"
-once_cell = "1.7"
+lua-patterns = "0.4"
+once_cell = "1.9"
 pico-args = "0.4"
-rlua = "0.17"
+rlua = "0.18"
+serial_test = "0.5"
 
 [dependencies.lolid]
 version = "1.0"
 features = ["prng"]
 
 [dependencies.uom]
-version = "0.31"
+version = "0.32"
 default-features = false
 features = ["autoconvert", "f64", "si", "std"]
 
 [dependencies.rlua-searcher]
 git = "https://git.sr.ht/~ioiojo/rlua-searcher"
-rev = "1bb9236f7b9e9fd6124d8fb8d20c554f783dc6a9"
+rev = "357f2b6fdd8091abdfafc31d1dfa9c470e50694e"
 
 [dependencies.fennel-searcher]
 git = "https://git.sr.ht/~ioiojo/fennel-searcher-rs"
-rev = "2ee6ff284ccc35b8b625c2fcdc26806413e15d28"
+rev = "d50bbf6b781770bb1256a5615d408e9641a3a9c7"
 
 [dependencies.include-fnl]
 git = "https://git.sr.ht/~ioiojo/include-fnl"
-rev = "9a4cb9578e50b8e3b322bcf74ba85927ff9c8cf3"
-
-[package.metadata.fennel]
-version = "0.9.1"
+rev = "f26ebb70e8e44ccd8a0c887fbdab91dab7766ee7"

@@ 1,5 1,6 @@
 use kiwi::cli_opts::{BaseOpts, Edict, Opts, ShowDietOpts};
 use kiwi::cli_setup::Setup;
+use serial_test::serial;
 use std::ffi::OsString;
 use std::path::PathBuf;
 


@@ 15,6 16,7 @@ macro_rules! assert_match {
 }
 
 #[test]
+#[serial]
 fn mock_setup_works() {
     use kiwi::cli_types::CliResult;
     use rlua::{Lua, Value};


@@ 106,7 108,7 @@ fn mock_setup_works() {
             .expect("eval (version)")
     });
 
-    assert_eq!(&version, "0.9.1");
+    assert_eq!(&version, "1.0.0");
 
     // Test access to Kiwi Fennel library from scripts in Kiwi working directory.
     lua.context::<_, rlua::Result<()>>(|lua_ctx| {


@@ 132,6 134,7 @@ fn mock_setup_works() {
 }
 
 #[test]
+#[serial]
 fn food_works() {
     use kiwi::food::{Composite, Food, Simple};
     use kiwi::food_env::SimpleEnv;


@@ 329,6 332,7 @@ fn food_works() {
 }
 
 #[test]
+#[serial]
 fn show_diet_from_normal_dir_works() {
     use kiwi::cli_command::show_diet;
 


@@ 377,6 381,7 @@ fn show_diet_from_normal_dir_works() {
 
 /// Test what happens in case of no matching data.
 #[test]
+#[serial]
 fn show_diet_from_normal_dir_nomatch_works() {
     use kiwi::cli_command::show_diet;
 


@@ 425,6 430,7 @@ fn show_diet_from_normal_dir_nomatch_works() {
 }
 
 #[test]
+#[serial]
 fn show_diet_from_macros_dir_works() {
     use kiwi::cli_command::show_diet;
 


@@ 472,6 478,7 @@ fn show_diet_from_macros_dir_works() {
 }
 
 #[test]
+#[serial]
 fn show_plan_works() {
     use kiwi::cli_command::show_plan;
 


@@ 520,6 527,7 @@ fn show_plan_works() {
 }
 
 #[test]
+#[serial]
 fn diet_from_normal_dir_works() {
     use kiwi::cli_command::load_diet;
     use kiwi::diet_proximates::Proximates;


@@ 629,6 637,7 @@ fn diet_from_normal_dir_works() {
 }
 
 #[test]
+#[serial]
 fn diet_from_macros_dir_works() {
     use kiwi::cli_command::load_diet;
     use kiwi::diet_proximates::Proximates;


@@ 708,6 717,7 @@ fn diet_from_macros_dir_works() {
 }
 
 #[test]
+#[serial]
 fn complex_pantry_works() {
     use kiwi::cli_types::CliResult;
     use kiwi::food::Food;


@@ 1225,6 1235,7 @@ fn complex_pantry_works() {
 }
 
 #[test]
+#[serial]
 fn complex_diet_works() {
     use chrono::naive::NaiveDate;
     use kiwi::cli_command::load_diet;


@@ 1420,6 1431,7 @@ fn complex_diet_works() {
 }
 
 #[test]
+#[serial]
 fn diet_composition_from_with_amino_acids_dir_works() {
     use kiwi::cli_command::load_diet;
     use kiwi::diet_composition::Composition;