on xenial help sign in
Merge card-tool.
commit9fb61f5e62628e600793890d41a4ade4eb7fe185 authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 7 Feb 2014, 11:39 (13 years ago) parentc8125a30da5e40
2 files changed+8−3
qml/Dash/CardTool.qml+1−2 tests/qmltests/Dash/tst_CardTool.qml+7−1
qml/Dash/CardTool.qml+1−2
@@ -105,10 +105,9 @@ Item {
105105 */
106106 readonly property alias headerHeight: card.headerHeight
107107
108− readonly property QtObject priv: card
109−
110108 Card {
111109 id: card
110+ objectName: "card"
112111 template: cardTool.template
113112 components: cardTool.components
114113
tests/qmltests/Dash/tst_CardTool.qml+7−1
@@ -209,7 +209,7 @@ Rectangle {
209209 id: dataArea
210210 anchors { left: parent.left; right: parent.right }
211211 height: units.gu(25)
212− text: JSON.stringify(cardTool.priv.cardData, undefined, 2)
212+ text: JSON.stringify(testCase.internalCard.cardData, undefined, 2)
213213 }
214214
215215 Label {
@@ -239,8 +239,14 @@ Rectangle {
239239 id: testCase
240240 name: "Card"
241241
242+ property Card internalCard: findChild(cardTool, "card")
243+
242244 when: windowShown
243245
246+ function init() {
247+ verify(typeof testCase.internalCard === "object", "Couldn't find internal card object.");
248+ }
249+
244250 function cleanup() {
245251 selector.selectedIndex = -1;
246252 layoutSelector.selectedIndex = -1;