git.iko.soy/unity8
on xenial help sign in
Fix login list test and implement basic session chooser test
481d474Josh Arenson
qml/Greeter/WideView.qml+1
compare with xenial
unifiedsplit
@@ -132,6 +132,7 @@ FocusScope {
132
132
133 Loader {
133 Loader {
134 id: loginAreaLoader
134 id: loginAreaLoader
135+ objectName: "loginAreaLoader"
135
136
136 // True when LoginList is shown, false when SessionList is shown
137 // True when LoginList is shown, false when SessionList is shown
137 property bool loginListShown: true
138 property bool loginListShown: true
tests/qmltests/Greeter/tst_WideView.qml+7−1
@@ -373,6 +373,12 @@ Item {
373 {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
373 {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
374 ]
374 ]
375 }
375 }
376+
377+ function test_sessionIconNotShownWithOneSession() {
378+ LightDM.Sessions.testScenario = "singleSession"
379+ compare(LightDM.Sessions.count, 1);
380+ }
381+
376 function test_tease(data) {
382 function test_tease(data) {
377 view.locked = data.locked;
383 view.locked = data.locked;
378 view.dragHandleLeftMargin = data.offset;
384 view.dragHandleLeftMargin = data.offset;
@@ -503,7 +509,7 @@ Item {
503 }
509 }
504
510
505 function test_loginListNotCoveredByKeyboard() {
511 function test_loginListNotCoveredByKeyboard() {
506− var loginList = findChild(view, "loginList");
512+ var loginList = findChild(view, "loginAreaLoader").item;
507 compare(loginList.height, view.height);
513 compare(loginList.height, view.height);
508
514
509 // when the vkb shows up, loginList is moved up to remain fully uncovered
515 // when the vkb shows up, loginList is moved up to remain fully uncovered