@@ -276,6 +276,16 @@ StyledItem {
276276 LightDM.Sessions.testScenario = "singleSession"
277277 }
278278 }
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+ }
279289 }
280290 Label {
281291 text: "Multiple Sessions"
@@ -429,12 +439,9 @@ StyledItem {
429439 compare(icon.indexOf(session) > -1, true);
430440
431441 // Test the session list icons are valid
432− view.loginListShown = false;
442+ view.state = "SessionsList";
433443 var sessionsList = findChild(view, "sessionsList");
434− var sessionsListSelector = findChild(view, "sessionsListSelector");
435444 tryCompare(sessionsList, "visible", true);
436− tryCompare(sessionsListSelector, "expanded", true);
437−
438445 }
439446
440447 function test_choosingNewSessionChangesLoginListIcon() {
@@ -448,12 +455,10 @@ StyledItem {
448455 compare(icon.indexOf("ubuntu") > -1, true);
449456
450457 tap(sessionChooserButton)
451− var sessionsListSelector = findChild(view, "sessionsListSelector");
452− waitForRendering(sessionsListSelector);
453458 for(var i = 0; i < LightDM.Sessions.count; i++) {
454459 var delegateName = "sessionDelegate" + String(i);
455460 var currentDelegate = findChild(view, delegateName);
456− if (currentDelegate.text === "GNOME") {
461+ if (currentDelegate._key === "gnome-classic") {
457462 tap(currentDelegate);
458463 var sessionChooserButton = findChild(view, "sessionChooserButton");
459464 waitForRendering(sessionChooserButton);
@@ -611,7 +616,7 @@ StyledItem {
611616 }
612617
613618 function test_loginListNotCoveredByKeyboard() {
614− var loginList = findChild(view, "loginAreaLoader").item;
619+ var loginList = findChild(view, "loginList");
615620 compare(loginList.height, view.height);
616621
617622 // when the vkb shows up, loginList is moved up to remain fully uncovered