d06bab6 · unity8 · git.iko.soy

qml/Greeter/Greeter.qml+1−1

compare with xenial

unifiedsplit

@@ -164,8 +164,8 @@ Showable {

164 function checkForcedUnlock() {

165 if (forcedUnlock && shown && loader.item) {

166 // pretend we were just authenticated

167− loader.item.hide();

168 loader.item.notifyAuthenticationSucceeded();

167 loader.item.notifyAuthenticationSucceeded();

168+ loader.item.hide();

169 }

170 }

171 }

tests/qmltests/Greeter/tst_Greeter.qml+7−1

@@ -328,9 +328,15 @@ Item {

328 LightDM.Greeter.active = true;

329

330 greeter.forcedUnlock = true;

331− compare(view.locked, false);

331+ compare(greeter.required, false);

332 greeter.forcedUnlock = false;

333

334+ // Now recover from tearing down the view above

335+ LightDM.Greeter.showGreeter();

336+ tryCompare(greeter, "required", true);

337+ tryCompare(greeter, "waiting", false);

338+ view = findChild(greeter, "testView");

339+

334 selectUser("no-password");

340 selectUser("no-password");

335 tryCompare(view, "locked", false);

341 tryCompare(view, "locked", false);

336 selectUser("has-password");

342 selectUser("has-password");

tests/qmltests/tst_Shell.qml+3−8

@@ -384,6 +384,7 @@ Rectangle {

384 setLightDMMockMode("single"); // back to the default value

385

386 AccountsService.demoEdges = false;

387+ AccountsService.demoEdgesCompleted = [];

387 Wizard.System.wizardEnabled = false;

388 Wizard.System.wizardEnabled = false;

388

389

389 // kill all (fake) running apps

390 // kill all (fake) running apps

@@ -535,9 +536,8 @@ Rectangle {

535

536

536 function test_tabletLeftEdgeDrag_data() {

537 function test_tabletLeftEdgeDrag_data() {

537 return [

538 return [

538− {tag: "without password", user: "no-password", loggedIn: true, demo: false},

539+ {tag: "without password", user: "no-password", loggedIn: true},

539− {tag: "with password", user: "has-password", loggedIn: false, demo: false},

540+ {tag: "with password", user: "has-password", loggedIn: false},

540− {tag: "with demo", user: "has-password", loggedIn: true, demo: true},

541 ]

542 }

543

@@ -547,10 +547,6 @@ Rectangle {

547

548 selectUser(data.user)

549

550− AccountsService.demoEdges = data.demo

551− var tutorial = findChild(shell, "tutorial");

552− tryCompare(tutorial, "running", data.demo);

553−

554 swipeFromLeftEdge(shell.width * 0.75)

550 swipeFromLeftEdge(shell.width * 0.75)

555 wait(500) // to give time to handle dash() signal from Launcher

551 wait(500) // to give time to handle dash() signal from Launcher

556 confirmLoggedIn(data.loggedIn)

552 confirmLoggedIn(data.loggedIn)

@@ -1130,7 +1126,6 @@ Rectangle {

1130 var tutorial = findChild(shell, "tutorial");

1126 var tutorial = findChild(shell, "tutorial");

1131

1127

1132 AccountsService.demoEdges = true;

1128 AccountsService.demoEdges = true;

1133− tryCompare(tutorial, "running", true);

1134 tryCompare(tutorial, "paused", true);

1129 tryCompare(tutorial, "paused", true);

1135

1130

1136 swipeAwayGreeter();

1131 swipeAwayGreeter();

tests/qmltests/tst_ShellWithPin.qml−22

@@ -251,28 +251,6 @@ Item {

251 tryCompare(sessionSpy, "count", 1)

252 }

253

254− function test_edgeDemoHidesLockscreen() {

255− LightDM.Greeter.showGreeter()

256− sessionSpy.clear()

257− var lockscreen = findChild(shell, "lockscreen")

258−

259− tryCompare(lockscreen, "shown", true)

260− AccountsService.demoEdges = true

261− tryCompare(lockscreen, "shown", false)

262−

263− var greeter = findChild(shell, "greeter");

264− swipeAwayGreeter(false);

265− tryCompare(greeter, "shown", false);

266− tryCompare(sessionSpy, "count", 1)

267−

268− // Lockscreen is only hidden by the edge demo, so if we turn that

269− // off and show greeter again, lockscreen should appear

270− AccountsService.demoEdges = false

271− LightDM.Greeter.showGreeter()

272− lockscreen = findChild(shell, "lockscreen");

273− tryCompare(lockscreen, "shown", true)

274− }

275−

276 function test_disabledEdges() {

254 function test_disabledEdges() {

277 var launcher = findChild(shell, "launcher")

255 var launcher = findChild(shell, "launcher")

278 tryCompare(launcher, "available", true)

256 tryCompare(launcher, "available", true)