Merge pull request #10357 from Byron/fix

Improve defaults after settings.json was deleted + recreated

Author: krlvi

crates/but-settings/assets/defaults.jsonc

@@ -19,11 +19,11 @@
 	},
 	"featureFlags": {
 		// Deprecated, was used for the new version of the UI.
-		"v3": false,
+		"v3": true,
 		// Enables the v3 safe checkout.
 		"cv3": false,
 		/// Enable the usage of V3 workspace APIs.
-		"ws3": false,
+		"ws3": true,
 		/// Enable undo/redo support.
 		"undo": false,
 		/// Enable the usage of GitButler Acitions.

crates/gitbutler-branch-actions/tests/reorder.rs

@@ -469,7 +469,9 @@ fn file(ctx: &CommandContext, commit_id: gix::ObjectId) -> String {
 }
 
 fn command_ctx(name: &str) -> Result<(CommandContext, TempDir)> {
-    gitbutler_testsupport::writable::fixture("reorder.sh", name)
+    gitbutler_testsupport::writable::fixture_with_settings("reorder.sh", name, |settings| {
+        settings.feature_flags.ws3 = false
+    })
 }
 
 fn test_ctx(ctx: &CommandContext) -> Result<TestContext> {

crates/gitbutler-branch-actions/tests/virtual_branches/create_virtual_branch_from_branch.rs

@@ -7,7 +7,8 @@ use super::*;
 
 #[test]
 fn integration() {
-    let Test { repo, ctx, .. } = &Test::default();
+    let Test { repo, ctx, .. } =
+        &Test::new_with_settings(|settings| settings.feature_flags.ws3 = false);
 
     gitbutler_branch_actions::set_base_branch(
         ctx,

crates/gitbutler-branch-actions/tests/virtual_branches/mod.rs

@@ -18,23 +18,17 @@ struct Test {
     ctx: CommandContext,
 }
 
-impl Drop for Test {
-    fn drop(&mut self) {
-        if std::env::var_os(VAR_NO_CLEANUP).is_some() {
-            let _ = self.data_dir.take().unwrap().keep();
-        }
-    }
-}
-
-impl Default for Test {
-    fn default() -> Self {
+impl Test {
+    pub fn new_with_settings(change_settings: fn(&mut AppSettings)) -> Self {
         let data_dir = paths::data_dir();
 
         let test_project = TestProject::default();
         let outcome = gitbutler_project::add_with_path(data_dir.as_ref(), test_project.path())
             .expect("failed to add project");
         let project = outcome.unwrap_project();
-        let ctx = CommandContext::open(&project, AppSettings::default()).unwrap();
+        let mut settings = AppSettings::default();
+        change_settings(&mut settings);
+        let ctx = CommandContext::open(&project, settings).unwrap();
 
         Self {
             repo: test_project,
@@ -46,6 +40,20 @@ impl Default for Test {
     }
 }
 
+impl Drop for Test {
+    fn drop(&mut self) {
+        if std::env::var_os(VAR_NO_CLEANUP).is_some() {
+            let _ = self.data_dir.take().unwrap().keep();
+        }
+    }
+}
+
+impl Default for Test {
+    fn default() -> Self {
+        Self::new_with_settings(|_settings| {})
+    }
+}
+
 impl Test {
     /// Consume this instance and keep the temp directory that held the local repository, returning it.
     /// Best used inside a `dbg!(test.debug_local_repo())`

crates/gitbutler-testsupport/src/lib.rs

@@ -80,9 +80,18 @@ pub mod writable {
     pub fn fixture(
         script_name: &str,
         project_directory: &str,
+    ) -> anyhow::Result<(CommandContext, TempDir)> {
+        fixture_with_settings(script_name, project_directory, |_| {})
+    }
+    pub fn fixture_with_settings(
+        script_name: &str,
+        project_directory: &str,
+        change_settings: fn(&mut AppSettings),
     ) -> anyhow::Result<(CommandContext, TempDir)> {
         let (project, tempdir) = fixture_project(script_name, project_directory)?;
-        let open = CommandContext::open(&project, AppSettings::default());
+        let mut settings = AppSettings::default();
+        change_settings(&mut settings);
+        let open = CommandContext::open(&project, settings);
         let ctx = open?;
         Ok((ctx, tempdir))
     }