git.iko.soy/unity8
on xenial help sign in
Clean up test configurations.
c31812bMichał Sawicz
tests/qmltests/Dash/tst_Card.qml+9−10
compare with xenial
unifiedsplit
@@ -82,23 +82,23 @@ Rectangle {
82
82
83 property var cardsModel: [
83 property var cardsModel: [
84 {
84 {
85− "name": "Art, header, summary - vertical",
85+ "name": "Art, header, summary",
86 "layout": { "components": JSON.parse(fullMapping) }
86 "layout": { "components": JSON.parse(fullMapping) }
87 },
87 },
88 {
88 {
89− "name": "Art, header, summary - vertical, small",
89+ "name": "Art, header, summary - small",
90 "layout": { "template": { "card-size": "small" }, "components": JSON.parse(fullMapping) }
90 "layout": { "template": { "card-size": "small" }, "components": JSON.parse(fullMapping) }
91 },
91 },
92 {
92 {
93− "name": "Art, header, summary - vertical, large",
93+ "name": "Art, header, summary - large",
94 "layout": { "template": { "card-size": "large" }, "components": JSON.parse(fullMapping) }
94 "layout": { "template": { "card-size": "large" }, "components": JSON.parse(fullMapping) }
95 },
95 },
96 {
96 {
97− "name": "Art, header, summary - vertical, wide",
97+ "name": "Art, header, summary - wide",
98 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "art": { "aspect-ratio": 2 } }) }
98 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "art": { "aspect-ratio": 2 } }) }
99 },
99 },
100 {
100 {
101− "name": "Art, title - vertical, fitted",
101+ "name": "Art, title - fitted",
102 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "art": { "fill-mode": "fit" } }) }
102 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "art": { "fill-mode": "fit" } }) }
103 },
103 },
104 {
104 {
@@ -107,17 +107,16 @@ Rectangle {
107 "components": JSON.parse(fullMapping) }
107 "components": JSON.parse(fullMapping) }
108 },
108 },
109 {
109 {
110− "name": "Art, header - vertical",
110+ "name": "Art, header",
111 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "summary": undefined }) }
111 "layout": { "components": Helpers.update(JSON.parse(root.fullMapping), { "summary": undefined }) }
112 },
112 },
113 {
113 {
114− "name": "Art, summary - vertical",
114+ "name": "Art, summary",
115 "layout": { "components": { "art": "art", "summary": "summary" } }
115 "layout": { "components": { "art": "art", "summary": "summary" } }
116 },
116 },
117 {
117 {
118− "name": "Header title only - horizontal",
118+ "name": "Header title only",
119− "layout": { "template": { "card-layout": "horizontal" },
120− "components": { "title": "title" } }
119+ "layout": { "components": { "title": "title" } }
121 },
120 },
122 ]
121 ]
123
122
tests/qmltests/Dash/tst_CardTool.qml+5−6
@@ -73,21 +73,20 @@ Rectangle {
73
73
74 property var cardsModel: [
74 property var cardsModel: [
75 {
75 {
76− "name": "Art, header, summary - vertical",
76+ "name": "Art, header, summary",
77 "layout": { "components": JSON.parse(fullMapping) }
77 "layout": { "components": JSON.parse(fullMapping) }
78 },
78 },
79 {
79 {
80− "name": "Art, header, summary - vertical, small",
80+ "name": "Art, header, summary - small",
81 "layout": { "template": { "card-size": "small" }, "components": JSON.parse(fullMapping) }
81 "layout": { "template": { "card-size": "small" }, "components": JSON.parse(fullMapping) }
82 },
82 },
83 {
83 {
84− "name": "Art, header, summary - vertical, large",
84+ "name": "Art, header, summary - large",
85 "layout": { "template": { "card-size": "large" }, "components": JSON.parse(fullMapping) }
85 "layout": { "template": { "card-size": "large" }, "components": JSON.parse(fullMapping) }
86 },
86 },
87 {
87 {
88− "name": "Header title only - horizontal",
88+ "name": "Header title only",
89− "layout": { "template": { "card-layout": "horizontal" },
90− "components": { "title": "title" } }
89+ "layout": { "components": { "title": "title" } }
91 },
90 },
92 ]
91 ]
93
92