@@ -24,6 +24,8 @@ import Unity.Application 0.1
2424import Unity.ApplicationMenu 0.1
2525import Unity.Indicators 0.1 as Indicators
2626import Ubuntu.Telephony 0.1 as Telephony
27+import AccountsService 0.1
28+import Unity.InputInfo 0.1
2729import "../../../qml/Panel"
2830import "../../../qml/Components/PanelState"
2931import "../Stages"
@@ -561,13 +563,15 @@ PanelTest {
561563
562564 // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1611959
563565 function test_windowControlButtonsFittsLaw() {
564− var buttonsVisible = PanelState.buttonsVisible;
565− PanelState.buttonsVisible = true;
566+ var buttonsVisible = PanelState.decorationsVisible;
567+ PanelState.decorationsVisible = true;
566568 // click in very topleft corner and verify the close button got clicked too
569+ wait(1000)
567570 mouseMove(panel, 0, 0);
568571 mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);
572+ wait(1000)
569573 compare(windowControlButtonsSpy.count, 1);
570− PanelState.buttonsVisible = buttonsVisible;
574+ PanelState.decorationsVisible = buttonsVisible;
571575 }
572576
573577 function test_hidingKeyboardIndicator_data() {
@@ -582,7 +586,7 @@ PanelTest {
582586 }
583587
584588 function test_hidingKeyboardIndicator(data) {
585− var item = findChild(indicatorsRow, "indicator-keyboard-panelItem");
589+ var item = findChild(panel, "indicator-keyboard-panelItem");
586590 AccountsService.keymaps = data.keymaps;
587591 if (data.keyboard) {
588592 MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);