Skip to content

Commit 1e527ad

Browse files
Merge branch 'master' into develop
2 parents 74e910d + 91836f7 commit 1e527ad

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

CHANGELOG.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ when selecting in Tree shows the filename in StatusBar.
3030

3131
=== Fixed
3232
- Fixed Create Desktop Shortcut by pointing executable to ``python -m robotide``.
33+
- Changed some informative dialogs and JSON Editor to use the customized colors.
34+
- Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.
35+
- On Windows ignore false modification on files when opening Test Suites, causing confirmation dialog.
3336

3437
== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.3.rst[2.1.3] - 2025-03-24
3538

utest/editor/test_z_kweditor_plugin.py

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
app.settings = FakeSettings()
100100
app.register_editor()
101101
"""
102+
generic_app = wx.App()
102103

103104
DATA = [['kw1', '', ''],
104105
['kw2', 'arg1', ''],
@@ -346,7 +347,7 @@ def test_on_comment_cells(self):
346347
self._grid.kweditor.on_comment_cells(None) # THIS IS NOT WORKING
347348
data = self._grid.kweditor.get_selected_content()
348349
print(f"DEBUG: After Sharp Comment Data Cell is {data}")
349-
# wx.CallLater(5000, self.app.ExitMainLoop)
350+
wx.CallLater(5000, self.app.ExitMainLoop)
350351
# self.app.MainLoop()
351352

352353

@@ -572,7 +573,37 @@ def test_htmlpopupwindow_dialog_title(self):
572573
print(f"DEBUG: test_z_kweditor.py: test_htmlpopupwindow_dialog_title title={title}")
573574
# wx.CallLater(4000, dlg.hide)
574575
# Uncomment next lines if you want to see the app
575-
# wx.CallLater(5000, self.app.ExitMainLoop)
576+
wx.CallLater(5000, self.app.ExitMainLoop)
577+
# self.app.MainLoop()
578+
579+
def test_htmlpopupwindow_dialog_simple(self):
580+
dlg = HtmlPopupWindow(self.frame, (400, 200), False, True)
581+
dlg.set_content("Example without title")
582+
dlg.show_at((1000, 200))
583+
shown=dlg.IsShown()
584+
print(f"DEBUG: test_z_kweditor.py: test_htmlpopupwindow_dialog_simple shown={shown}")
585+
assert shown is True
586+
wx.CallLater(4000, dlg.hide)
587+
# Uncomment next lines if you want to see the app
588+
wx.CallLater(5000, self.app.ExitMainLoop)
589+
# self.app.MainLoop()
590+
591+
def test_htmlpopupwindow_dialog_title(self):
592+
dlg = HtmlPopupWindow(self.panel, (400, 200), True, True)
593+
dlg.set_content("Example with title", "This is the Title")
594+
dlg.show_at((1000, 100))
595+
shown=dlg.IsShown()
596+
assert shown is True
597+
pw_size = dlg.pw_size
598+
pw_pos = dlg.screen_position
599+
print(f"DEBUG: test_z_kweditor.py: test_htmlpopupwindow_dialog_title pw_size={pw_size} scree_pos={pw_pos}")
600+
event=wx.KeyEvent()
601+
dlg._detach(event)
602+
title = dlg._detached_title
603+
print(f"DEBUG: test_z_kweditor.py: test_htmlpopupwindow_dialog_title title={title}")
604+
wx.CallLater(4000, dlg.hide)
605+
# Uncomment next lines if you want to see the app
606+
wx.CallLater(5000, self.app.ExitMainLoop)
576607
# self.app.MainLoop()
577608

578609
def test_contentassist_text_editor(self):

0 commit comments

Comments
 (0)