Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/hiddenWindowPopup into lp:ubuntu-ui-toolkit/staging

Proposed by Christian Dywan
Status: Needs review
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/hiddenWindowPopup
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 26 lines (+16/-0)
1 file modified
tests/unit/visual/tst_popups_dialog.13.qml (+16/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/hiddenWindowPopup
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing
Ubuntu SDK team Pending
Review via email: mp+317530@code.launchpad.net

Commit message

Add unit test case opening popup before showing window

Description of the change

The fix for bug 166420 didn't introduce a regression test.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

2172. By Christian Dywan

Add unit test case opening popup before showing window

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/unit/visual/tst_popups_dialog.13.qml'
--- tests/unit/visual/tst_popups_dialog.13.qml 2017-01-05 14:11:37 +0000
+++ tests/unit/visual/tst_popups_dialog.13.qml 2017-02-16 17:29:08 +0000
@@ -34,6 +34,22 @@
34 }34 }
3535
36 UbuntuTestCase {36 UbuntuTestCase {
37 id: hiddenTest
38 name: "Popups.Dialog.Hidden"
39
40 property bool dialogDestroyed: false
41
42 function test_dismiss_dialog_no_focus_window_bug1664620() {
43 verify(!hiddenTest.windowShown);
44 var dlg = PopupUtils.open(dialog);
45 waitForRendering(dlg);
46 dlg.Component.destruction.connect(function() { hiddenTest.dialogDestroyed = true });
47 keyClick(Qt.Key_Escape);
48 tryCompare(hiddenTest, "dialogDestroyed", true, 500, "Dialog not destroyed");
49 }
50 }
51
52 UbuntuTestCase {
37 id: test53 id: test
38 name: "Popups.Dialog"54 name: "Popups.Dialog"
39 when: windowShown55 when: windowShown

Subscribers

People subscribed via source and target branches