git.iko.soy/unity8
on xenial help sign in
Add test; fix lock state resetting when in full-shell
6c2bac9Michael Terry
qml/Greeter/Greeter.qml+1
compare with xenial
unifiedsplit
@@ -60,6 +60,7 @@ Showable {
60 signal emergencyCall()
60 signal emergencyCall()
61
61
62 function forceShow() {
62 function forceShow() {
63+ forcedUnlock = false;
63 showNow();
64 showNow();
64 d.selectUser(d.currentIndex, true);
65 d.selectUser(d.currentIndex, true);
65 }
66 }
tests/qmltests/tst_Shell.qml+20
@@ -65,6 +65,7 @@ Rectangle {
65 property int shellOrientation: Qt.PortraitOrientation
65 property int shellOrientation: Qt.PortraitOrientation
66 property int nativeOrientation: Qt.PortraitOrientation
66 property int nativeOrientation: Qt.PortraitOrientation
67 property int primaryOrientation: Qt.PortraitOrientation
67 property int primaryOrientation: Qt.PortraitOrientation
68+ property string mode: "full-greeter"
68
69
69 state: "phone"
70 state: "phone"
70 states: [
71 states: [
@@ -114,6 +115,7 @@ Rectangle {
114 native_: shellLoader.nativeOrientation
115 native_: shellLoader.nativeOrientation
115 primary: shellLoader.primaryOrientation
116 primary: shellLoader.primaryOrientation
116 }
117 }
118+ mode: shellLoader.mode
117 Component.onDestruction: {
119 Component.onDestruction: {
118 shellLoader.itemDestroyed = true;
120 shellLoader.itemDestroyed = true;
119 }
121 }
@@ -508,6 +510,7 @@ Rectangle {
508 AccountsService.demoEdges = false;
510 AccountsService.demoEdges = false;
509 AccountsService.demoEdgesCompleted = [];
511 AccountsService.demoEdgesCompleted = [];
510 Wizard.System.wizardEnabled = false;
512 Wizard.System.wizardEnabled = false;
513+ shellLoader.mode = "full-greeter";
511
514
512 // kill all (fake) running apps
515 // kill all (fake) running apps
513 killApps();
516 killApps();
@@ -2454,5 +2457,22 @@ Rectangle {
2454
2457
2455 tryCompare(appDelegate, "state", "normal");
2458 tryCompare(appDelegate, "state", "normal");
2456 }
2459 }
2460+
2461+ function test_fullShellModeHasNoInitialGreeter() {
2462+ setLightDMMockMode("single-pin");
2463+ shellLoader.mode = "full-shell";
2464+ loadShell("phone");
2465+ shell.usageScenario = "phone";
2466+ waitForRendering(shell);
2467+
2468+ var greeter = findChild(shell, "greeter");
2469+ verify(!greeter.shown);
2470+ verify(!greeter.locked);
2471+
2472+ showGreeter();
2473+
2474+ verify(greeter.shown);
2475+ verify(greeter.locked);
2476+ }
2457 }
2477 }
2458}
2478}