Close #121

CHANGELOG.md

@@ -8,14 +8,14 @@
 
 ### Fixed
 
+- use mutable fixture in in cases and value list (See #121)
+
 ## [0.10.0] 2021/05/16
 
 ### Add
 
 - Rename fixture (See #107 and #108)  
 
-### Changed
-
 ### Fixed
 
 - Wired behaviour in `#[fixture]` with generics types that have transitive

src/render/inject.rs

@@ -7,7 +7,7 @@ use syn::{parse_quote, Expr, FnArg, Ident, Stmt, Type};
 use crate::{
     refident::{MaybeIdent, MaybeType},
     resolver::Resolver,
-    utils::IsLiteralExpression,
+    utils::{fn_arg_mutability, IsLiteralExpression},
 };
 
 pub(crate) fn resolve_aruments<'a>(
@@ -44,6 +44,10 @@ where
 
     fn resolve(&self, arg: &FnArg) -> Option<Stmt> {
         let ident = arg.maybe_ident()?;
+        let mutability = fn_arg_mutability(arg);
+        let unused_mut: Option<syn::Attribute> = mutability
+            .as_ref()
+            .map(|_| parse_quote! {#[allow(unused_mut)]});
         let arg_type = arg.maybe_type()?;
         let fixture_name = self.fixture_name(ident);
 
@@ -57,7 +61,8 @@ where
             fixture = Cow::Owned((self.magic_conversion)(fixture, arg_type));
         }
         Some(parse_quote! {
-            let #ident = #fixture;
+            #unused_mut
+            let #mutability #ident = #fixture;
         })
     }
 
@@ -153,13 +158,16 @@ mod should {
         test::{assert_eq, *},
         utils::fn_args,
     };
-    
+
     #[rstest]
     #[case::as_is("fix: String", "let fix = fix::default();")]
     #[case::without_underscore("_fix: String", "let _fix = fix::default();")]
     #[case::do_not_remove_inner_underscores("f_i_x: String", "let f_i_x = f_i_x::default();")]
     #[case::do_not_remove_double_underscore("__fix: String", "let __fix = __fix::default();")]
-    #[case::without_mut("mut fix: String", "let fix = fix::default();")]
+    #[case::preserve_mut_but_annotate_as_allow_unused_mut(
+        "mut fix: String",
+        "#[allow(unused_mut)] let mut fix = fix::default();"
+    )]
     fn call_fixture(#[case] arg_str: &str, #[case] expected: &str) {
         let arg = arg_str.ast();
 
@@ -171,7 +179,8 @@ mod should {
     }
 
     #[rstest]
-    #[case::as_is("mut fix: String", ("fix", expr("bar()")), "let fix = bar();")]
+    #[case::as_is("fix: String", ("fix", expr("bar()")), "let fix = bar();")]
+    #[case::with_allow_unused_mut("mut fix: String", ("fix", expr("bar()")), "#[allow(unused_mut)] let mut fix = bar();")]
     #[case::without_undescore("_fix: String", ("fix", expr("bar()")), "let _fix = bar();")]
     fn call_given_fixture(
         #[case] arg_str: &str,

src/utils.rs

@@ -260,6 +260,16 @@ fn first_type_path_segment_ident(t: &Type) -> Option<&Ident> {
     }
 }
 
+pub(crate) fn fn_arg_mutability(arg: &FnArg) -> Option<syn::token::Mut> {
+    match arg {
+        FnArg::Typed(syn::PatType { pat, .. }) => match pat.as_ref() {
+            syn::Pat::Ident(syn::PatIdent { mutability, .. }) => mutability.clone(),
+            _ => None,
+        },
+        _ => None,
+    }
+}
+
 #[cfg(test)]
 mod test {
     use syn::parse_quote;

tests/resources/rstest/use_mutable_fixture_in_parametric_argumnts.rs

@@ -0,0 +1,25 @@
+use rstest::*;
+
+#[fixture]
+fn f() -> String {
+    "f".to_owned()
+}
+
+fn append(s: &mut String, a: &str) -> String {
+    s.push_str("-");
+    s.push_str(a);
+    s.clone()
+}
+
+#[rstest]
+#[case(append(&mut f, "a"), "f-a", "f-a-b")]
+fn use_mutate_fixture(
+    mut f: String,
+    #[case] a: String,
+    #[values(append(&mut f, "b"))] b: String,
+    #[case] expected_a: &str,
+    #[case] expected_b: &str,
+) {
+    assert_eq!(expected_a, a);
+    assert_eq!(expected_b, b);
+}

tests/rstest/mod.rs

@@ -93,6 +93,15 @@ fn impl_input() {
         .assert(output);
 }
 
+#[test]
+fn use_mutable_fixture_in_parametric_argumnts() {
+    let (output, _) = run_test("use_mutable_fixture_in_parametric_argumnts.rs");
+
+    TestResults::new()
+        .ok("use_mutate_fixture::case_1::b_1")
+        .assert(output);
+}
+
 #[test]
 fn should_reject_no_item_function() {
     let (output, name) = run_test("reject_no_item_function.rs");