Fix failing e2e tests

rojo-rbx · Aug 4, 2023 · 9d20fce · 9d20fce
1 parent 6475a62
commit 9d20fce
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__script_meta_disabled.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__script_meta_disabled.snap
@@ -11,6 +11,7 @@ expression: contents
       <Properties>
         <string name="Name">hello</string>
         <bool name="Disabled">true</bool>
+        <token name="RunContext">0</token>
         <string name="Source">-- This script should be marked 'Disabled'</string>
       </Properties>
     </Item>

diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__server_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_in_folder.snap
@@ -10,6 +10,7 @@ expression: contents
     <Item class="Script" referent="1">
       <Properties>
         <string name="Name">serverScript</string>
+        <token name="RunContext">0</token>
         <string name="Source">-- This is a Lua server script</string>
       </Properties>
     </Item>

diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__server_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_init.snap
@@ -6,6 +6,7 @@ expression: contents
   <Item class="Script" referent="0">
     <Properties>
       <string name="Name">server_init</string>
+      <token name="RunContext">0</token>
       <string name="Source">return "From folder/init.server.lua"</string>
     </Properties>
   </Item>

diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap
@@ -24,6 +24,8 @@ instances:
     Name: bar
     Parent: id-2
     Properties:
+      RunContext:
+        Enum: 0
       Source:
         String: "-- Hello, from bar!"
   id-4:

diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap
@@ -24,6 +24,8 @@ instances:
     Name: bar
     Parent: id-2
     Properties:
+      RunContext:
+        Enum: 0
       Source:
         String: "-- Hello, from bar!"
   id-4:

diff --git a/tests/tests/serve.rs b/tests/tests/serve.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-use insta::assert_yaml_snapshot;
+use insta::{assert_yaml_snapshot, with_settings};
 use tempfile::tempdir;
 
 use crate::rojo_test::{internable::InternAndRedact, serve_util::run_serve_test};
@@ -30,10 +30,12 @@ fn scripts() {
         assert_yaml_snapshot!("scripts_info", redactions.redacted_yaml(info));
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(
-            "scripts_all",
-            read_response.intern_and_redact(&mut redactions, root_id)
-        );
+        with_settings!({ sort_maps => true }, {
+            assert_yaml_snapshot!(
+                "scripts_all",
+                read_response.intern_and_redact(&mut redactions, root_id)
+            );
+        });
 
         fs::write(session.path().join("src/foo.lua"), "Updated foo!").unwrap();
 
@@ -44,10 +46,12 @@ fn scripts() {
         );
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(
-            "scripts_all-2",
-            read_response.intern_and_redact(&mut redactions, root_id)
-        );
+        with_settings!({ sort_maps => true }, {
+            assert_yaml_snapshot!(
+                "scripts_all-2",
+                read_response.intern_and_redact(&mut redactions, root_id)
+            );
+        });
     });
 }