76642b6 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Some minor fixes

76642b6Michael Terry11 years ago

qml/Greeter/Greeter.qml+3−5

compare with xenial

unifiedsplit

@@ -16,6 +16,7 @@

17import QtQuick 2.3

18import AccountsService 0.1

19+import GSettings 1.0

19import LightDM 0.1 as LightDM

20import LightDM 0.1 as LightDM

20import Ubuntu.Components 1.1

21import Ubuntu.Components 1.1

21import Ubuntu.SystemImage 0.1

22import Ubuntu.SystemImage 0.1

@@ -184,6 +185,7 @@ Showable {

184 GSettings {

185 GSettings {

185 id: greeterSettings

186 id: greeterSettings

186 schema.id: "com.canonical.Unity8.Greeter"

187 schema.id: "com.canonical.Unity8.Greeter"

188+ onLockedOutUntilChanged: forcedDelayTimer.checkForForcedDelay()

187 }

189 }

188

190

189 Timer {

191 Timer {

@@ -216,13 +218,9 @@ Showable {

216 function checkForForcedDelay() {

218 function checkForForcedDelay() {

217 delayTarget = new Date();

219 delayTarget = new Date();

218 delayTarget.setTime(greeterSettings.lockedOutUntil);

220 delayTarget.setTime(greeterSettings.lockedOutUntil);

219− trigger();

221+ triggered();

220 }

222 }

221

223

222− Connections {

223− target: greeterSettings

224− onLockedOutUntilChanged: checkForForcedDelay()

225− }

226 Component.onCompleted: checkForForcedDelay()

224 Component.onCompleted: checkForForcedDelay()

227 }

225 }

228

226

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

@@ -20,6 +20,7 @@ import ".."

20import "../../../qml/Greeter"

21import Ubuntu.Components 0.1

22import AccountsService 0.1

23+import GSettings 1.0

23import LightDM 0.1 as LightDM

24import LightDM 0.1 as LightDM

24import Unity.Test 0.1 as UT

25import Unity.Test 0.1 as UT

@@ -75,6 +76,11 @@ Item {

75 signalName: "emergencyCall"

76 signalName: "emergencyCall"

76 }

77 }

79+ GSettings {

80+ id: greeterSettings

81+ schema.id: "com.canonical.Unity8.Greeter"

82+ }

83+

78 UT.UnityTestCase {

84 UT.UnityTestCase {

79 id: testCase

85 id: testCase

80 name: "Greeter"

86 name: "Greeter"

@@ -148,6 +154,7 @@ Item {

148 verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

154 verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

149 greeter.failedLoginsDelayAttempts = 7;

155 greeter.failedLoginsDelayAttempts = 7;

150 greeter.failedLoginsDelayMinutes = 5;

156 greeter.failedLoginsDelayMinutes = 5;

157+ greeterSettings.lockedOutUntil = 0;

151 }

158 }

152

159

153 function cleanup() {

160 function cleanup() {

@@ -439,22 +446,22 @@ Item {

439 view.responded("wr0ng p4ssw0rd");

446 view.responded("wr0ng p4ssw0rd");

440

447

441 var timestamp = new Date().getTime() + 60000;

448 var timestamp = new Date().getTime() + 60000;

442− compare(GSettingsController.lockedOutUntil, timestamp);

449+ verify(Math.abs(greeterSettings.lockedOutUntil - timestamp) < 3);

443 }

450 }

444

451

445 function test_forcedDelayFromGSettings() {

452 function test_forcedDelayFromGSettings() {

446 compare(view.delayMinutes, 0);

453 compare(view.delayMinutes, 0);

447 var timestamp = new Date().getTime() + 30; // in 30 seconds

454 var timestamp = new Date().getTime() + 30; // in 30 seconds

448− GSettingsController.lockedOutUntil = timestamp;

455+ greeterSettings.lockedOutUntil = timestamp;

449− tryCompare(view, "delayMinutes", 1);

456+ compare(view.delayMinutes, 1);

450 }

457 }

451

458

452 function test_forcedDelayOnConstruction() {

459 function test_forcedDelayOnConstruction() {

453 var timestamp = new Date().getTime() + 30; // in 30 seconds

460 var timestamp = new Date().getTime() + 30; // in 30 seconds

454− GSettingsController.lockedOutUntil = timestamp;

461+ greeterSettings.lockedOutUntil = timestamp;

455 cleanup();

462 cleanup();

456− init();

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

457− tryCompare(view, "delayMinutes", 1);

464+ compare(view.delayMinutes, 1);

458 }

465 }

459

466

460 function test_forcedDelayRoundTrip() {

467 function test_forcedDelayRoundTrip() {

@@ -466,7 +473,7 @@ Item {

466

473

467 compare(view.delayMinutes, 0);

474 compare(view.delayMinutes, 0);

468 view.responded("wr0ng p4ssw0rd");

475 view.responded("wr0ng p4ssw0rd");

469− tryCompare(view, "delayMinutes", 1);

476+ compare(view.delayMinutes, 1);

470 tryCompare(view, "delayMinutes", 0);

477 tryCompare(view, "delayMinutes", 0);

471 }

478 }

472

479