f2a51f5 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

some test fixing

f2a51f5Lukáš Tinkl11 years ago

qml/Wizard/Pages/50-timezone.qml+2−1

compare with xenial

unifiedsplit

@@ -124,6 +124,7 @@ LocalComponents.Page {

124

125 LocalComponents.WizardTextField {

126 id: searchField

127+ objectName: "tzFilter"

127 anchors.left: parent.left

128 anchors.left: parent.left

128 anchors.right: parent.right

129 anchors.right: parent.right

129 anchors.leftMargin: leftMargin

130 anchors.leftMargin: leftMargin

@@ -151,7 +152,7 @@ LocalComponents.Page {

151

152

152 ListView {

153 ListView {

153 id: tzList;

154 id: tzList;

154−

155+ objectName: "tzList"

155 boundsBehavior: Flickable.StopAtBounds

156 boundsBehavior: Flickable.StopAtBounds

156 clip: true

157 clip: true

157 currentIndex: -1

158 currentIndex: -1

qml/Wizard/Pages/60-uaccount-signup.qml+1−1

@@ -21,7 +21,7 @@ import AccountsService 0.1

21import ".." as LocalComponents

23LocalComponents.Page {

24− objectName: "ubuntuAccountSignUpPage"

24+ objectName: "accountPage"

26 title: i18n.tr("Create Device Account")

27 customTitle: true

qml/Wizard/Pages/75-report-check.qml+1−1

@@ -22,7 +22,7 @@ import ".." as LocalComponents

23LocalComponents.Page {

24 id: reportCheckPage

25− objectName: "reportCheckPage"

25+ objectName: "reportingPage"

27 title: webview.visible ? i18n.tr("Privacy Policy") : i18n.tr("Help Us Improve")

28 forwardButtonSourceComponent: !webview.visible ? forwardButton : null

tests/qmltests/Wizard/tst_Wizard.qml+33−22

@@ -178,11 +178,6 @@ Item {

178 tap(findChild(page, "forwardButton"));

179 }

180

181− page = waitForPage("passwdPage");

182− if (name === page.objectName) return page;

183− tap(findChild(page, "passwdDelegate0"));

184− tap(findChild(page, "forwardButton"));

185−

186 page = waitForPage("wifiPage");

181 page = waitForPage("wifiPage");

187 if (name === page.objectName) return page;

182 if (name === page.objectName) return page;

188 tap(findChild(page, "forwardButton"));

183 tap(findChild(page, "forwardButton"));

@@ -193,6 +188,22 @@ Item {

193 tap(findChild(page, "forwardButton"));

188 tap(findChild(page, "forwardButton"));

194 }

189 }

195

190

191+ page = waitForPage("tzPage");

192+ if (name === page.objectName) return page;

193+ tap(findChild(page, "tzFilter"));

194+ typeString("London");

195+ var tzList = findChild(page, "tzList");

196+ verify(tzList);

197+ tzList.itemAt(0, 0).clicked();

198+ tap(findChild(page, "forwardButton"));

199+

200+ // TODO account page

201+

202+ page = waitForPage("passwdPage");

203+ if (name === page.objectName) return page;

204+ tap(findChild(page, "passwdDelegate3")); // swipe

205+ tap(findChild(page, "forwardButton"));

206+

196 if (!skipReporting) {

207 if (!skipReporting) {

197 page = waitForPage("reportingPage");

208 page = waitForPage("reportingPage");

198 if (name === page.objectName) return page;

209 if (name === page.objectName) return page;

@@ -237,27 +248,27 @@ Item {

237

248

238 function test_simUnavailableSkip() {

249 function test_simUnavailableSkip() {

239 MockQOfono.available = false;

250 MockQOfono.available = false;

240− goToPage("passwdPage", true);

251+ goToPage("wifiPage", true);

241 }

252 }

242

253

243 function test_simNoModemsSkip() {

254 function test_simNoModemsSkip() {

244 MockQOfono.setModems([], [], []);

255 MockQOfono.setModems([], [], []);

245− goToPage("passwdPage", true);

256+ goToPage("wifiPage", true);

246 }

257 }

247

258

248 function test_simFirstSkip() {

259 function test_simFirstSkip() {

249 MockQOfono.setModems(["a", "b"], [true, false], []);

260 MockQOfono.setModems(["a", "b"], [true, false], []);

250− goToPage("passwdPage", true);

261+ goToPage("wifiPage", true);

251 }

262 }

252

263

253 function test_simSecondSkip() {

264 function test_simSecondSkip() {

254 MockQOfono.setModems(["a", "b"], [false, true], []);

265 MockQOfono.setModems(["a", "b"], [false, true], []);

255− goToPage("passwdPage", true);

266+ goToPage("wifiPage", true);

256 }

267 }

257

268

258 function test_simBothSkip() {

269 function test_simBothSkip() {

259 MockQOfono.setModems(["a", "b"], [true, true], []);

270 MockQOfono.setModems(["a", "b"], [true, true], []);

260− goToPage("passwdPage", true);

271+ goToPage("wifiPage", true);

261 }

272 }

262

273

263 function test_simWaitOnManagerAsync() {

274 function test_simWaitOnManagerAsync() {

@@ -302,7 +313,7 @@ Item {

302

313

303 // Now just wait for timeout

314 // Now just wait for timeout

304 compare(timeout.running, true);

315 compare(timeout.running, true);

305− waitForPage("passwdPage");

316+ waitForPage("wifiPage");

306 compare(timeout.running, false);

317 compare(timeout.running, false);

307 }

318 }

308

319

@@ -339,7 +350,7 @@ Item {

339

350

340 // now finish up

351 // now finish up

341 tap(findChild(page, "forwardButton"));

352 tap(findChild(page, "forwardButton"));

342− page = waitForPage("locationPage");

353+ page = waitForPage("reportingPage");

343 tap(findChild(page, "forwardButton"));

354 tap(findChild(page, "forwardButton"));

344 page = waitForPage("finishedPage");

355 page = waitForPage("finishedPage");

345 tap(findChild(page, "forwardButton"));

356 tap(findChild(page, "forwardButton"));

@@ -390,7 +401,7 @@ Item {

390

401

391 // now finish up

402 // now finish up

392 tap(findChild(page, "forwardButton"));

403 tap(findChild(page, "forwardButton"));

393− page = waitForPage("locationPage");

404+ page = waitForPage("reportingPage");

394 tap(findChild(page, "forwardButton"));

405 tap(findChild(page, "forwardButton"));

395 page = waitForPage("finishedPage");

406 page = waitForPage("finishedPage");

396 tap(findChild(page, "forwardButton"));

407 tap(findChild(page, "forwardButton"));

@@ -439,9 +450,9 @@ Item {

439

450

440 function test_locationGpsOnly() {

451 function test_locationGpsOnly() {

441 var page = goToPage("locationPage");

452 var page = goToPage("locationPage");

442− var gpsCheck = findChild(page, "gpsCheck");

453+ var gpsCheck = findChild(page, "gpsCheckLabel");

443− var hereCheck = findChild(page, "hereCheck");

454+ var hereCheck = findChild(page, "hereCheckLabel");

444− var nopeCheck = findChild(page, "nopeCheck");

455+ var nopeCheck = findChild(page, "nopeCheckLabel");

445

456

446 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

457 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

447 activateLocationSpy.target = locationActionGroup.location;

458 activateLocationSpy.target = locationActionGroup.location;

@@ -460,9 +471,9 @@ Item {

460

471

461 function test_locationNope() {

472 function test_locationNope() {

462 var page = goToPage("locationPage");

473 var page = goToPage("locationPage");

463− var gpsCheck = findChild(page, "gpsCheck");

474+ var gpsCheck = findChild(page, "gpsCheckLabel");

464− var hereCheck = findChild(page, "hereCheck");

475+ var hereCheck = findChild(page, "hereCheckLabel");

465− var nopeCheck = findChild(page, "nopeCheck");

476+ var nopeCheck = findChild(page, "nopeCheckLabel");

466

477

467 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

478 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

468 activateLocationSpy.target = locationActionGroup.location;

479 activateLocationSpy.target = locationActionGroup.location;

@@ -481,9 +492,9 @@ Item {

481

492

482 function test_locationHere() {

493 function test_locationHere() {

483 var page = goToPage("locationPage");

494 var page = goToPage("locationPage");

484− var gpsCheck = findChild(page, "gpsCheck");

495+ var gpsCheck = findChild(page, "gpsCheckLabel");

485− var hereCheck = findChild(page, "hereCheck");

496+ var hereCheck = findChild(page, "hereCheckLabel");

486− var nopeCheck = findChild(page, "nopeCheck");

497+ var nopeCheck = findChild(page, "nopeCheckLabel");

487

498

488 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

499 var locationActionGroup = findInvisibleChild(page, "locationActionGroup");

489 activateLocationSpy.target = locationActionGroup.location;

500 activateLocationSpy.target = locationActionGroup.location;