git.iko.soy/unity8
on xenial help sign in
Fixed failing tests
commit4b36f44f5082d12574d8f439932a00e24db100f0 authorMarcus Tomlinson <marcus.tomlinson@canonical.com> dateFri 12 Sep 2014, 11:31 (12 years ago) parent0598556
4 files changed+8−3
compare with xenial
unifiedsplit
qml/Dash/CardCarousel.qml+1−1 qml/Dash/CardHorizontalList.qml+1−1 qml/Dash/CardVerticalJournal.qml+1−1 tests/qmltests/Dash/tst_PreviewListView.qml+5
qml/Dash/CardCarousel.qml+1−1
@@ -49,7 +49,7 @@ DashRenderer {
4949 objectName: "carouselDelegate" + index
5050
5151 function clicked() { cardCarousel.clicked(index, model.result, loader.item, model) }
52− function pressAndHold() { cardCarousel.pressAndHold(index, model) }
52+ function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }
5353
5454 sourceComponent: cardTool.cardComponent
5555 onLoaded: {
qml/Dash/CardHorizontalList.qml+1−1
@@ -55,7 +55,7 @@ DashRenderer {
5555 Connections {
5656 target: loader.item
5757 onClicked: root.clicked(index, result, loader.item, model)
58− onPressAndHold: root.pressAndHold(index, model)
58+ onPressAndHold: root.pressAndHold(index, result, model)
5959 }
6060 }
6161 }
qml/Dash/CardVerticalJournal.qml+1−1
@@ -62,7 +62,7 @@ DashRenderer {
6262 Connections {
6363 target: loader.item
6464 onClicked: root.clicked(index, result, loader.item, model)
65− onPressAndHold: root.pressAndHold(index, model)
65+ onPressAndHold: root.pressAndHold(index, result, model)
6666 }
6767 }
6868 }
tests/qmltests/Dash/tst_PreviewListView.qml+5
@@ -35,6 +35,10 @@ Rectangle {
3535 id: mockResultsModel
3636 }
3737
38+ Unity.FakePreviewModel {
39+ id: mockPreviewModel
40+ }
41+
3842 PreviewListView {
3943 id: listView
4044 anchors.fill: parent
@@ -58,6 +62,7 @@ Rectangle {
5862 function init() {
5963 listView.model = mockResultsModel;
6064 listView.currentIndex = 1;
65+ listView.currentItem.previewModel = mockPreviewModel;
6166 listView.open = true;
6267 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
6368 }