Unity 8

Merge lp:~canonical-platform-qa/unity8/add_object_name_for_setup_wizard into lp:unity8

add_object_name_for_setup_wizard
Merge into trunk

Proposed by Omer Akram on 2016-07-18

Status:	Merged
Approved by:	Albert Astals Cid on 2016-08-09
Approved revision:	2547
Merged at revision:	2589
Proposed branch:	lp:~canonical-platform-qa/unity8/add_object_name_for_setup_wizard
Merge into:	lp:unity8
Diff against target:	54 lines (+5/-3) 3 files modified qml/Wizard/Pages/10-welcome.qml (+2/-1) qml/Wizard/Pages/30-wifi.qml (+2/-1) tests/qmltests/Wizard/tst_Wizard.qml (+1/-1)
To merge this branch:	bzr merge lp:~canonical-platform-qa/unity8/add_object_name_for_setup_wizard
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Approve on 2016-08-09
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-27
Michael Zanetti (community)		2016-07-18	Needs Fixing on 2016-07-27
Review via email: mp+300380@code.launchpad.net

Commit Message

Add object names for setup wizard

Description of the Change

Add object names for setup wizard, tests will live in lp:ubuntu-system-tests

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-18:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1761/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/unity8/add_object_name_for_setup_wizard updated on 2016-07-26

2544. By Omer Akram on 2016-07-26: revert wrongly changed test
2545. By Omer Akram on 2016-07-26: Merge trunk
2546. By Omer Akram on 2016-07-26: Fix language selection test

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1817/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1820/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-07-27:

2 inline comments

review: Needs Fixing

lp:~canonical-platform-qa/unity8/add_object_name_for_setup_wizard updated on 2016-07-27

2547. By Omer Akram on 2016-07-27: fix per review

Omer Akram (om26er) wrote on 2016-07-27:

> 2 inline comments

Thanks Mike, fixed per your suggestions.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-27:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1823/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-09:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Unrelated failures.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Canonical Platform QA Team

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Wizard/Pages/10-welcome.qml'
2	--- qml/Wizard/Pages/10-welcome.qml 2016-06-06 15:08:02 +0000
3	+++ qml/Wizard/Pages/10-welcome.qml 2016-07-27 12:46:09 +0000
4	@@ -110,6 +110,7 @@
5
6	ListView {
7	id: languagesListView
8	+ objectName: "languagesListView"
9	clip: true
10	snapMode: ListView.SnapToItem
11
12	@@ -124,7 +125,7 @@
13
14	delegate: ListItem {
15	id: itemDelegate
16	- objectName: "languageDelegate" + index
17	+ objectName: "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')
18	highlightColor: backgroundColor
19	divider.colorFrom: dividerColor
20	divider.colorTo: backgroundColor
21
22	=== modified file 'qml/Wizard/Pages/30-wifi.qml'
23	--- qml/Wizard/Pages/30-wifi.qml 2016-03-29 03:47:39 +0000
24	+++ qml/Wizard/Pages/30-wifi.qml 2016-07-27 12:46:09 +0000
25	@@ -72,7 +72,7 @@
26	id: accessPointComponent
27	ListItem {
28	id: accessPoint
29	- objectName: "accessPoint"
30	+ objectName: "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')
31	highlightColor: backgroundColor
32	enabled: menuData && menuData.sensitive \|\| false
33	divider.colorFrom: dividerColor
34	@@ -166,6 +166,7 @@
35
36	ListView {
37	id: listview
38	+ objectName: "accessPointsListView"
39	anchors.left: parent.left
40	anchors.right: parent.right
41	clip: true
42
43	=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
44	--- tests/qmltests/Wizard/tst_Wizard.qml 2016-06-29 14:44:41 +0000
45	+++ tests/qmltests/Wizard/tst_Wizard.qml 2016-07-27 12:46:09 +0000
46	@@ -223,7 +223,7 @@
47
48	function test_languageChange() {
49	var page = goToPage("languagePage");
50	- tap(findChild(page, "languageDelegate1")); // should invoke "fr" lang
51	+ tap(findChild(page, "languageDelegate_french_(france)")); // should invoke "fr" lang
52
53	tryCompare(i18n, "language", "fr_FR");
54	tap(findChild(page, "forwardButton"));