git.iko.soy/unity8
on xenial help sign in
more test fixes
cb2fb90Nick Dedekind
tests/qmltests/Panel/tst_Panel.qml+8−4
compare with xenial
unifiedsplit
@@ -24,6 +24,8 @@ import Unity.Application 0.1
24import Unity.ApplicationMenu 0.1
24import Unity.ApplicationMenu 0.1
25import Unity.Indicators 0.1 as Indicators
25import Unity.Indicators 0.1 as Indicators
26import Ubuntu.Telephony 0.1 as Telephony
26import Ubuntu.Telephony 0.1 as Telephony
27+import AccountsService 0.1
28+import Unity.InputInfo 0.1
27import "../../../qml/Panel"
29import "../../../qml/Panel"
28import "../../../qml/Components/PanelState"
30import "../../../qml/Components/PanelState"
29import "../Stages"
31import "../Stages"
@@ -561,13 +563,15 @@ PanelTest {
561
563
562 // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1611959
564 // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1611959
563 function test_windowControlButtonsFittsLaw() {
565 function test_windowControlButtonsFittsLaw() {
564− var buttonsVisible = PanelState.buttonsVisible;
566+ var buttonsVisible = PanelState.decorationsVisible;
565− PanelState.buttonsVisible = true;
567+ PanelState.decorationsVisible = true;
566 // click in very topleft corner and verify the close button got clicked too
568 // click in very topleft corner and verify the close button got clicked too
569+ wait(1000)
567 mouseMove(panel, 0, 0);
570 mouseMove(panel, 0, 0);
568 mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);
571 mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);
572+ wait(1000)
569 compare(windowControlButtonsSpy.count, 1);
573 compare(windowControlButtonsSpy.count, 1);
570− PanelState.buttonsVisible = buttonsVisible;
574+ PanelState.decorationsVisible = buttonsVisible;
571 }
575 }
572
576
573 function test_hidingKeyboardIndicator_data() {
577 function test_hidingKeyboardIndicator_data() {
@@ -582,7 +586,7 @@ PanelTest {
582 }
586 }
583
587
584 function test_hidingKeyboardIndicator(data) {
588 function test_hidingKeyboardIndicator(data) {
585− var item = findChild(indicatorsRow, "indicator-keyboard-panelItem");
589+ var item = findChild(panel, "indicator-keyboard-panelItem");
586 AccountsService.keymaps = data.keymaps;
590 AccountsService.keymaps = data.keymaps;
587 if (data.keyboard) {
591 if (data.keyboard) {
588 MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
592 MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);