git.iko.soy/unity8
on xenial help sign in
Fix shell test
cdf3261Michael Terry
qml/Greeter/GreeterPrompt.qml+1
compare with xenial
unifiedsplit
@@ -57,6 +57,7 @@ FocusScope {
57 }
57 }
58
58
59 AbstractButton {
59 AbstractButton {
60+ objectName: "promptButton"
60 anchors.fill: parent
61 anchors.fill: parent
61 visible: !root.isPrompt
62 visible: !root.isPrompt
62 enabled: d.enabled
63 enabled: d.enabled
tests/qmltests/tst_Shell.qml+7−3
@@ -809,10 +809,14 @@ Rectangle {
809 var greeter = findChild(shell, "greeter")
809 var greeter = findChild(shell, "greeter")
810 tryCompare(greeter, "fullyShown", true);
810 tryCompare(greeter, "fullyShown", true);
811
811
812− var passwordMouseArea = findChild(shell, "passwordMouseArea")
812+ var passwordInput = findChild(shell, "passwordInput");
813+
814+ var promptButton = findChild(passwordInput, "promptButton");
815+ tryCompare(promptButton, "visible", isButton);
816+
817+ var promptField = findChild(passwordInput, "promptField");
813− tryCompare(passwordMouseArea, "enabled", isButton)
818+ tryCompare(promptField, "visible", !isButton);
814
819
815− var passwordInput = findChild(shell, "passwordInput")
816 mouseClick(passwordInput)
820 mouseClick(passwordInput)
817 }
821 }
818
822