Before each test change to appropriate remember-tabs gsettings

ldrahnik · Nov 4, 2023 · 21f9633 · 21f9633
1 parent e580218
commit 21f9633
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 deletions.
diff --git a/src/Application.vala b/src/Application.vala
@@ -14,8 +14,6 @@ public class Terminal.Application : Gtk.Application {
     public static GLib.Settings settings;
     public static GLib.Settings settings_sys;
 
-    public bool is_testing { get; set construct; }
-
     private static Themes themes;
 
     public Application () {

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -1357,11 +1357,6 @@ namespace Terminal {
             string[] opened_tabs = {};
             int focused_tab = 0;
 
-            // Continuous saving of opened terminals interferes with current unit tests
-            if (app.is_testing) {
-                return;
-            }
-
             if (save_zooms && current_terminal != null) {
                 Application.saved_state.set_double ("zoom", current_terminal.font_scale);
             }

diff --git a/src/tests/Application.vala b/src/tests/Application.vala
@@ -10,10 +10,26 @@ namespace Terminal.Test.Application {
     delegate void CommandLineCallback (ApplicationCommandLine command_line);
     delegate void ActivateCallback ();
 
-    private void setup () {
+    private GLib.Settings getSettingsWithNoContinuousSaving() {
+        GLib.Settings settings = new GLib.Settings ("io.elementary.terminal.settings");
+        settings.set_boolean ("remember-tabs", false);
+        return settings;
+    }
+
+    private GLib.Settings getSettingsWithContinousSaving() {
+        GLib.Settings settings = new GLib.Settings ("io.elementary.terminal.settings");
+        settings.set_boolean ("remember-tabs", true);
+        return settings;
+    }
+
+    private void setup (GLib.Settings ?settings = null) {
+
+        if (settings == null) {
+            Application.getSettingsWithNoContinuousSaving ();
+        }
+
         application = new Terminal.Application () {
-            application_id = "io.elementary.terminal.tests.application",
-            is_testing = true
+            application_id = "io.elementary.terminal.tests.application"
         };
 
         application.shutdown.connect (() => application.get_windows ().foreach ((win) => win.destroy ()));
@@ -48,9 +64,10 @@ namespace Terminal.Test.Application {
         }
     }
 
-    private void option (string options, string platform_data, CommandLineCallback callback) {
+    private void option (string options, string platform_data, CommandLineCallback callback, GLib.Settings ?settings = null) {
         ulong oneshot = 0;
-        setup ();
+
+        setup (settings);
 
         oneshot = application.command_line.connect ((nil) => {
             application.disconnect (oneshot);
@@ -74,9 +91,10 @@ namespace Terminal.Test.Application {
         }
     }
 
-    private void action (string name, Variant? @value, ActivateCallback callback) {
+    private void action (string name, Variant? @value, ActivateCallback callback, GLib.Settings ?settings = null) {
         ulong oneshot = 0;
-        setup ();
+
+        setup (settings);
 
         oneshot = application.command_line.connect ((nill) => {
             application.disconnect (oneshot);
@@ -155,6 +173,28 @@ namespace Terminal.Test.Application {
                 var n_tabs = (int) window.terminals.length ();
                 assert_cmpint (n_tabs, CompareOperator.EQ, 1);
             });
+
+            // continous saving below
+            option ("{'new-tab':<true>}", "@a{sv} {}", () => {
+                unowned var window = (MainWindow) application.active_window;
+                assert_nonnull (window);
+                var n_tabs = (int) window.terminals.length ();
+                assert_cmpint (n_tabs, CompareOperator.EQ, 2);
+            }, getSettingsWithContinousSaving());
+
+            option ("{'new-tab':<false>}", "@a{sv} {}", () => {
+                unowned var window = (MainWindow) application.active_window;
+                assert_nonnull (window);
+                var n_tabs = (int) window.terminals.length ();
+                assert_cmpint (n_tabs, CompareOperator.EQ, 2);
+            }, getSettingsWithContinousSaving());
+
+            option ("{'new-tab':<true>}", "@a{sv} {}", () => {
+                unowned var window = (MainWindow) application.active_window;
+                assert_nonnull (window);
+                var n_tabs = (int) window.terminals.length ();
+                assert_cmpint (n_tabs, CompareOperator.EQ, 3);
+            }, getSettingsWithContinousSaving());
         });
 
         GLib.Test.add_func ("/application/command-line/new-window", () => {