From 5628a84b1c4c3a925124ba1083e7317b1debfdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 5 Dec 2024 11:10:18 +0100 Subject: [PATCH] WIP --- dangerzone/gui/main_window.py | 3 ++- tests/gui/test_main_window.py | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index aae0f59..e61e524 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -130,6 +130,7 @@ class MainWindow(QtWidgets.QMainWindow): self.setWindowTitle("Dangerzone") self.setWindowIcon(self.dangerzone.get_window_icon()) + self.alert = None self.setMinimumWidth(600) if platform.system() == "Darwin": @@ -322,7 +323,7 @@ class MainWindow(QtWidgets.QMainWindow): has_cancel=False, ) - upgrade_action.triggered.connect(lambda: widget.launch()) + upgrade_action.triggered.connect(lambda: self.alert.launch()) hamburger_menu.insertAction(sep, upgrade_action) self.hamburger_button.setIcon( diff --git a/tests/gui/test_main_window.py b/tests/gui/test_main_window.py index 0b5d803..5a14c15 100644 --- a/tests/gui/test_main_window.py +++ b/tests/gui/test_main_window.py @@ -616,6 +616,7 @@ def test_outdated_docker_desktop_displays_warning( mock_app = mocker.MagicMock() dummy = mocker.MagicMock(spec=Container) dummy.check_docker_desktop_version.return_value = (False, "1.0.0") + dz = DangerzoneGui(mock_app, dummy) load_svg_spy = mocker.spy(main_window_module, "load_svg_image") @@ -632,5 +633,12 @@ def test_outdated_docker_desktop_displays_warning( load_svg_spy.call_args_list[2].args[0] == "hamburger_menu_update_dot_error.svg" ) - # Clicking the menu item should open a warning message + alert_spy = mocker.spy(window.alert, "launch") + menu_actions[0].trigger() + + # Clicking the menu item should open a warning message + def _check_alert_displayed(): + alert_spy.assert_any_call() + + QtCore.QTimer.singleShot(0, _check_alert_displayed)