git.iko.soy/unity8
on xenial help sign in
Fix tst_Tutorial.qml
15d3b84Daniel d'Andrada
tests/qmltests/Tutorial/tst_Tutorial.qml+3−9
compare with xenial
unifiedsplit
@@ -17,7 +17,6 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import AccountsService 0.1
19import AccountsService 0.1
20−import GSettings 1.0
21import LightDM 0.1 as LightDM
20import LightDM 0.1 as LightDM
22import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
23import Unity.Application 0.1
22import Unity.Application 0.1
@@ -46,11 +45,6 @@ Item {
46 }
45 }
47 }
46 }
48
47
49− GSettings {
50− id: unity8Settings
51− schema.id: "com.canonical.Unity8"
52− }
53−
54 Component.onCompleted: {
48 Component.onCompleted: {
55 // must set the mock mode before loading the Shell
49 // must set the mock mode before loading the Shell
56 LightDM.Greeter.mockMode = "single-pin";
50 LightDM.Greeter.mockMode = "single-pin";
@@ -118,7 +112,7 @@ Item {
118
112
119 function init() {
113 function init() {
120 tryCompare(shell, "enabled", true); // enabled by greeter when ready
114 tryCompare(shell, "enabled", true); // enabled by greeter when ready
121− unity8Settings.usageMode = "Staged";
115+
122 AccountsService.demoEdges = false;
116 AccountsService.demoEdges = false;
123 AccountsService.demoEdges = true;
117 AccountsService.demoEdges = true;
124 swipeAwayGreeter();
118 swipeAwayGreeter();
@@ -192,7 +186,7 @@ Item {
192 }
186 }
193
187
194 function checkRightEdge() {
188 function checkRightEdge() {
195− if (unity8Settings.usageMode === "Staged") {
189+ if (shell.usageScenario === "phone") {
196 touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);
190 touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);
197
191
198 var stage = findChild(shell, "stage");
192 var stage = findChild(shell, "stage");
@@ -270,7 +264,7 @@ Item {
270 }
264 }
271
265
272 function test_walkthroughOnDesktop() {
266 function test_walkthroughOnDesktop() {
273− unity8Settings.usageMode = "Windowed";
267+ shell.usageScenario = "desktop";
274 var page = goToPage("tutorialLeftFinish");
268 var page = goToPage("tutorialLeftFinish");
275 var tick = findChild(page, "tick");
269 var tick = findChild(page, "tick");
276 tap(tick);
270 tap(tick);