@@ -17,7 +17,6 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import AccountsService 0.1
20−import GSettings 1.0
2120import LightDM 0.1 as LightDM
2221import Ubuntu.Components 1.1
2322import Unity.Application 0.1
@@ -46,11 +45,6 @@ Item {
4645 }
4746 }
4847
49− GSettings {
50− id: unity8Settings
51− schema.id: "com.canonical.Unity8"
52− }
53−
5448 Component.onCompleted: {
5549 // must set the mock mode before loading the Shell
5650 LightDM.Greeter.mockMode = "single-pin";
@@ -118,7 +112,7 @@ Item {
118112
119113 function init() {
120114 tryCompare(shell, "enabled", true); // enabled by greeter when ready
121− unity8Settings.usageMode = "Staged";
115+
122116 AccountsService.demoEdges = false;
123117 AccountsService.demoEdges = true;
124118 swipeAwayGreeter();
@@ -192,7 +186,7 @@ Item {
192186 }
193187
194188 function checkRightEdge() {
195− if (unity8Settings.usageMode === "Staged") {
189+ if (shell.usageScenario === "phone") {
196190 touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);
197191
198192 var stage = findChild(shell, "stage");
@@ -270,7 +264,7 @@ Item {
270264 }
271265
272266 function test_walkthroughOnDesktop() {
273− unity8Settings.usageMode = "Windowed";
267+ shell.usageScenario = "desktop";
274268 var page = goToPage("tutorialLeftFinish");
275269 var tick = findChild(page, "tick");
276270 tap(tick);