76642b6 · unity8 · git.iko.soy

git.iko.soy/unity8

Some minor fixes

commit76642b6f6d8a650a2fb2bcb43bd94f03357d24f8 authorMichael Terry <mike@mterry.name> dateWed 19 Aug 2015, 13:05 (11 years ago) parentb2372a5

2 files changed+17−12

compare with xenial

unifiedsplit

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

qml/Greeter/Greeter.qml+3−5

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

1616

1717import QtQuick 2.3

1818import AccountsService 0.1

19+import GSettings 1.0

1920import LightDM 0.1 as LightDM

2021import Ubuntu.Components 1.1

2122import Ubuntu.SystemImage 0.1

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

184185 GSettings {

185186 id: greeterSettings

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

188+ onLockedOutUntilChanged: forcedDelayTimer.checkForForcedDelay()

187189 }

188190

189191 Timer {

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

216218 function checkForForcedDelay() {

217219 delayTarget = new Date();

218220 delayTarget.setTime(greeterSettings.lockedOutUntil);

219− trigger();

221+ triggered();

220222 }

221223

222− Connections {

223− target: greeterSettings

224− onLockedOutUntilChanged: checkForForcedDelay()

225− }

226224 Component.onCompleted: checkForForcedDelay()

227225 }

228226

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

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

2020import "../../../qml/Greeter"

2121import Ubuntu.Components 0.1

2222import AccountsService 0.1

23+import GSettings 1.0

2324import LightDM 0.1 as LightDM

2425import Unity.Test 0.1 as UT

2526

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

7576 signalName: "emergencyCall"

7677 }

7778

79+ GSettings {

80+ id: greeterSettings

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

82+ }

83+

7884 UT.UnityTestCase {

7985 id: testCase

8086 name: "Greeter"

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

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

149155 greeter.failedLoginsDelayAttempts = 7;

150156 greeter.failedLoginsDelayMinutes = 5;

157+ greeterSettings.lockedOutUntil = 0;

151158 }

152159

153160 function cleanup() {

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

439446 view.responded("wr0ng p4ssw0rd");

440447

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

442− compare(GSettingsController.lockedOutUntil, timestamp);

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

443450 }

444451

445452 function test_forcedDelayFromGSettings() {

446453 compare(view.delayMinutes, 0);

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

448− GSettingsController.lockedOutUntil = timestamp;

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

455+ greeterSettings.lockedOutUntil = timestamp;

456+ compare(view.delayMinutes, 1);

450457 }

451458

452459 function test_forcedDelayOnConstruction() {

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

454− GSettingsController.lockedOutUntil = timestamp;

461+ greeterSettings.lockedOutUntil = timestamp;

455462 cleanup();

456− init();

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

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

464+ compare(view.delayMinutes, 1);

458465 }

459466

460467 function test_forcedDelayRoundTrip() {

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

466473

467474 compare(view.delayMinutes, 0);

468475 view.responded("wr0ng p4ssw0rd");

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

476+ compare(view.delayMinutes, 1);

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

471478 }

472479