on xenial help sign in
Fix testCard
8d9c902Albert Astals Cid
tests/qmltests/Dash/tst_Card.qml+4−4
@@ -112,7 +112,7 @@ Rectangle {
112 id: cardTool
112 id: cardTool
113 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];
113 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];
114 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];
114 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];
115− viewWidth: units.gu(48)
115+ viewWidth: units.gu(40)
116 }
116 }
117
117
118 readonly property var card: loader.item
118 readonly property var card: loader.item
@@ -261,10 +261,10 @@ Rectangle {
261
261
262 function test_card_size_data() {
262 function test_card_size_data() {
263 return [
263 return [
264− { tag: "Medium", width: units.gu(18.5), index: 0 },
264+ { tag: "Medium", width: units.gu(18), index: 0 },
265 { tag: "Small", width: units.gu(12), index: 1 },
265 { tag: "Small", width: units.gu(12), index: 1 },
266 { tag: "Large", width: units.gu(38), index: 2 },
266 { tag: "Large", width: units.gu(38), index: 2 },
267− { tag: "Wide", width: units.gu(18.5), index: 0 },
267+ { tag: "Wide", width: units.gu(18), index: 0 },
268 { tag: "Horizontal", width: units.gu(38), index: 5 },
268 { tag: "Horizontal", width: units.gu(38), index: 5 },
269 // Make sure card ends with header when there's no summary
269 // Make sure card ends with header when there's no summary
270 { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");
270 { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");
@@ -296,7 +296,7 @@ Rectangle {
296
296
297 function test_art_size_data() {
297 function test_art_size_data() {
298 return [
298 return [
299− { tag: "Medium", width: units.gu(18.5), fill: Image.PreserveAspectCrop, index: 0 },
299+ { tag: "Medium", width: units.gu(18), fill: Image.PreserveAspectCrop, index: 0 },
300 { tag: "Small", width: units.gu(12), index: 1 },
300 { tag: "Small", width: units.gu(12), index: 1 },
301 { tag: "Large", width: units.gu(38), index: 2 },
301 { tag: "Large", width: units.gu(38), index: 2 },
302 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },
302 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },