git.iko.soy/unity8
on xenial help sign in
Add object names for setup wizard
1d28d6bOmer Akram
qml/Wizard/Pages/10-welcome.qml+2−1
compare with xenial
unifiedsplit
@@ -110,6 +110,7 @@ LocalComponents.Page {
110
110
111 ListView {
111 ListView {
112 id: languagesListView
112 id: languagesListView
113+ objectName: "languagesListView"
113 clip: true
114 clip: true
114 snapMode: ListView.SnapToItem
115 snapMode: ListView.SnapToItem
115
116
@@ -124,7 +125,7 @@ LocalComponents.Page {
124
125
125 delegate: ListItem {
126 delegate: ListItem {
126 id: itemDelegate
127 id: itemDelegate
127− objectName: "languageDelegate" + index
128+ objectName: "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')
128 highlightColor: backgroundColor
129 highlightColor: backgroundColor
129 divider.colorFrom: dividerColor
130 divider.colorFrom: dividerColor
130 divider.colorTo: backgroundColor
131 divider.colorTo: backgroundColor
qml/Wizard/Pages/30-wifi.qml+2−1
@@ -72,7 +72,7 @@ LocalComponents.Page {
72 id: accessPointComponent
72 id: accessPointComponent
73 ListItem {
73 ListItem {
74 id: accessPoint
74 id: accessPoint
75− objectName: "accessPoint"
75+ objectName: "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')
76 highlightColor: backgroundColor
76 highlightColor: backgroundColor
77 enabled: menuData && menuData.sensitive || false
77 enabled: menuData && menuData.sensitive || false
78 divider.colorFrom: dividerColor
78 divider.colorFrom: dividerColor
@@ -166,6 +166,7 @@ LocalComponents.Page {
166
166
167 ListView {
167 ListView {
168 id: listview
168 id: listview
169+ objectName: "accessPointsListView"
169 anchors.left: parent.left
170 anchors.left: parent.left
170 anchors.right: parent.right
171 anchors.right: parent.right
171 clip: true
172 clip: true
tests/qmltests/Wizard/tst_Wizard.qml+1−1
@@ -223,7 +223,7 @@ Item {
223
223
224 function test_languageChange() {
224 function test_languageChange() {
225 var page = goToPage("languagePage");
225 var page = goToPage("languagePage");
226− tap(findChild(page, "languageDelegate1")); // should invoke "fr" lang
226+ tap(findChild(page, "languageDelegate_french_(france)")); // should invoke "fr" lang
227
227
228 tryCompare(i18n, "language", "fr_FR");
228 tryCompare(i18n, "language", "fr_FR");
229 tap(findChild(page, "forwardButton"));
229 tap(findChild(page, "forwardButton"));