fix test

Author: makspll

assets/tests/add_system/system_cannot_access_unspecified_resource_in_non_exclusive_system__RETURNS.lua

@@ -19,7 +19,8 @@ function my_non_exclusive_system()
     local ResourceType = world.get_type_by_name("TestResource")
     assert_throws(function()
         local res = world.get_resource(ResourceType)
-    end, ".*cannot claim access to.*")
+        local blah = res.blahblah
+    end, ".*annot claim access to.*")
 end
 
 

assets/tests/add_system/system_cannot_access_unspecified_resource_in_non_exclusive_system__RETURNS.rhai

@@ -13,7 +13,8 @@ fn my_non_exclusive_system() {
     let ResourceType = world.get_type_by_name.call("TestResource");
     assert_throws(|| {
         let res = world.get_resource.call(ResourceType);
-    }, ".*Cannot claim access to.*");
+        let blah = res.blahblah
+    }, ".*annot claim access to.*");
 }
 
 fn on_test_post_update() {

crates/bevy_mod_scripting_core/src/bindings/access_map.rs

@@ -1219,4 +1219,23 @@ mod test {
         assert!(!subset_access_map.claim_write_access(2));
         assert!(!subset_access_map.claim_global_access());
     }
+
+    #[test]
+    fn subset_map_retains_subset_in_scope() {
+        let access_map = AccessMap::default();
+        let subset_access_map = SubsetAccessMap {
+            inner: access_map,
+            subset: Box::new(|id| id == 1),
+        };
+
+        subset_access_map.with_scope(|| {
+            assert!(subset_access_map.claim_read_access(1));
+            assert!(!subset_access_map.claim_read_access(2));
+            assert!(!subset_access_map.claim_write_access(2));
+        });
+
+        assert!(subset_access_map.claim_read_access(1));
+        assert!(!subset_access_map.claim_read_access(2));
+        assert!(!subset_access_map.claim_write_access(2));
+    }
 }

crates/bevy_mod_scripting_core/src/bindings/script_system.rs

@@ -413,7 +413,6 @@ impl<P: IntoScriptPluginParams> System for DynamicScriptSystem<P> {
         };
 
         let mut payload = Vec::with_capacity(state.system_params.len());
-
         let guard = if self.exclusive {
             // safety: we are an exclusive system, therefore the cell allows us to do this
             let world = unsafe { world.world_mut() };