git.iko.soy/unity8
on xenial help sign in
Fix tests
8651f06Josh Arenson
qml/Greeter/SessionsList.qml+2
compare with xenial
unifiedsplit
@@ -103,7 +103,9 @@ Item {
103 highlightFollowsCurrentItem: false
103 highlightFollowsCurrentItem: false
104 delegate: ListItem {
104 delegate: ListItem {
105 id: delegate
105 id: delegate
106+ objectName: "sessionDelegate" + index
106
107
108+ readonly property string _key: key
107 divider.visible: false
109 divider.visible: false
108
110
109 visible: y > sessionsList.headerItem.y
111 visible: y > sessionsList.headerItem.y
qml/Greeter/WideView.qml+2
@@ -32,6 +32,7 @@ FocusScope {
32 property alias alphanumeric: loginList.alphanumeric
32 property alias alphanumeric: loginList.alphanumeric
33 property alias locked: loginList.locked
33 property alias locked: loginList.locked
34 property alias sessionToStart: loginList.currentSession
34 property alias sessionToStart: loginList.currentSession
35+ property alias state: coverPage.state // Used for testing
35 property var userModel // Set from outside
36 property var userModel // Set from outside
36
37
37 readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
38 readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
@@ -119,6 +120,7 @@ FocusScope {
119
120
120 LoginList {
121 LoginList {
121 id: loginList
122 id: loginList
123+ objectName: "loginList"
122
124
123 height: inputMethod && inputMethod.visible ?
125 height: inputMethod && inputMethod.visible ?
124 parent.height - inputMethod.keyboardRectangle.height : parent.height
126 parent.height - inputMethod.keyboardRectangle.height : parent.height
tests/qmltests/Greeter/tst_WideView.qml+13−8
@@ -276,6 +276,16 @@ StyledItem {
276 LightDM.Sessions.testScenario = "singleSession"
276 LightDM.Sessions.testScenario = "singleSession"
277 }
277 }
278 }
278 }
279+ Connections {
280+ target: LightDM.Sessions
281+ onTestScenarioChanged: {
282+ if (LightDM.Sessions.testScenario === "multipleSessions") {
283+ multipleSessionsCheckbox.checked = true;
284+ } else {
285+ multipleSessionsCheckbox.checked = false;
286+ }
287+ }
288+ }
279 }
289 }
280 Label {
290 Label {
281 text: "Multiple Sessions"
291 text: "Multiple Sessions"
@@ -429,12 +439,9 @@ StyledItem {
429 compare(icon.indexOf(session) > -1, true);
439 compare(icon.indexOf(session) > -1, true);
430
440
431 // Test the session list icons are valid
441 // Test the session list icons are valid
432− view.loginListShown = false;
442+ view.state = "SessionsList";
433 var sessionsList = findChild(view, "sessionsList");
443 var sessionsList = findChild(view, "sessionsList");
434− var sessionsListSelector = findChild(view, "sessionsListSelector");
435 tryCompare(sessionsList, "visible", true);
444 tryCompare(sessionsList, "visible", true);
436− tryCompare(sessionsListSelector, "expanded", true);
437−
438 }
445 }
439
446
440 function test_choosingNewSessionChangesLoginListIcon() {
447 function test_choosingNewSessionChangesLoginListIcon() {
@@ -448,12 +455,10 @@ StyledItem {
448 compare(icon.indexOf("ubuntu") > -1, true);
455 compare(icon.indexOf("ubuntu") > -1, true);
449
456
450 tap(sessionChooserButton)
457 tap(sessionChooserButton)
451− var sessionsListSelector = findChild(view, "sessionsListSelector");
452− waitForRendering(sessionsListSelector);
453 for(var i = 0; i < LightDM.Sessions.count; i++) {
458 for(var i = 0; i < LightDM.Sessions.count; i++) {
454 var delegateName = "sessionDelegate" + String(i);
459 var delegateName = "sessionDelegate" + String(i);
455 var currentDelegate = findChild(view, delegateName);
460 var currentDelegate = findChild(view, delegateName);
456− if (currentDelegate.text === "GNOME") {
461+ if (currentDelegate._key === "gnome-classic") {
457 tap(currentDelegate);
462 tap(currentDelegate);
458 var sessionChooserButton = findChild(view, "sessionChooserButton");
463 var sessionChooserButton = findChild(view, "sessionChooserButton");
459 waitForRendering(sessionChooserButton);
464 waitForRendering(sessionChooserButton);
@@ -611,7 +616,7 @@ StyledItem {
611 }
616 }
612
617
613 function test_loginListNotCoveredByKeyboard() {
618 function test_loginListNotCoveredByKeyboard() {
614− var loginList = findChild(view, "loginAreaLoader").item;
619+ var loginList = findChild(view, "loginList");
615 compare(loginList.height, view.height);
620 compare(loginList.height, view.height);
616
621
617 // when the vkb shows up, loginList is moved up to remain fully uncovered
622 // when the vkb shows up, loginList is moved up to remain fully uncovered