This commit is contained in:
Alexis Métaireau 2024-12-05 11:10:18 +01:00
parent 33d9d89e42
commit 5628a84b1c
No known key found for this signature in database
GPG key ID: C65C7A89A8FFC56E
2 changed files with 11 additions and 2 deletions

View file

@ -130,6 +130,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.setWindowTitle("Dangerzone") self.setWindowTitle("Dangerzone")
self.setWindowIcon(self.dangerzone.get_window_icon()) self.setWindowIcon(self.dangerzone.get_window_icon())
self.alert = None
self.setMinimumWidth(600) self.setMinimumWidth(600)
if platform.system() == "Darwin": if platform.system() == "Darwin":
@ -322,7 +323,7 @@ class MainWindow(QtWidgets.QMainWindow):
has_cancel=False, has_cancel=False,
) )
upgrade_action.triggered.connect(lambda: widget.launch()) upgrade_action.triggered.connect(lambda: self.alert.launch())
hamburger_menu.insertAction(sep, upgrade_action) hamburger_menu.insertAction(sep, upgrade_action)
self.hamburger_button.setIcon( self.hamburger_button.setIcon(

View file

@ -616,6 +616,7 @@ def test_outdated_docker_desktop_displays_warning(
mock_app = mocker.MagicMock() mock_app = mocker.MagicMock()
dummy = mocker.MagicMock(spec=Container) dummy = mocker.MagicMock(spec=Container)
dummy.check_docker_desktop_version.return_value = (False, "1.0.0") dummy.check_docker_desktop_version.return_value = (False, "1.0.0")
dz = DangerzoneGui(mock_app, dummy) dz = DangerzoneGui(mock_app, dummy)
load_svg_spy = mocker.spy(main_window_module, "load_svg_image") 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" 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() 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)