Merge lp:~zsombi/ubuntu-ui-toolkit/fixListItem56 into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 2134
Merged at revision: 2138
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/fixListItem56
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+2/-2)
2 files modified
tests/unit/visual/tst_listitem.12.qml (+1/-1)
tests/unit/visual/tst_listitem.13.qml (+1/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/fixListItem56
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+307818@code.launchpad.net

Commit message

Fix color used to test ListItem.highlighted.

Description of the change

Fix color used to test ListItem.highlighted.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Straight-forward, makes sense. Thanks for fixing this test case!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'tests/unit/visual/FIXME-QT56_listitem.12.qml' => 'tests/unit/visual/tst_listitem.12.qml'
--- tests/unit/visual/FIXME-QT56_listitem.12.qml 2016-09-16 11:03:43 +0000
+++ tests/unit/visual/tst_listitem.12.qml 2016-10-06 11:27:22 +0000
@@ -247,7 +247,7 @@
247 function test_0_defaults() {247 function test_0_defaults() {
248 verify(defaults.contentItem !== null, "Defaults is null");248 verify(defaults.contentItem !== null, "Defaults is null");
249 compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");249 compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");
250 compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default")250 compare(defaults.highlightColor, theme.palette.highlighted.background, "theme.palette.selected.background color by default")
251 compare(defaults.highlighted, false, "Not highlighted by default");251 compare(defaults.highlighted, false, "Not highlighted by default");
252 compare(defaults.divider.visible, true, "divider is visible by default");252 compare(defaults.divider.visible, true, "divider is visible by default");
253 compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");253 compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");
254254
=== renamed file 'tests/unit/visual/FIXME-QT56_listitem.13.qml' => 'tests/unit/visual/tst_listitem.13.qml'
--- tests/unit/visual/FIXME-QT56_listitem.13.qml 2016-09-16 11:03:43 +0000
+++ tests/unit/visual/tst_listitem.13.qml 2016-10-06 11:27:22 +0000
@@ -247,7 +247,7 @@
247 function test_0_defaults() {247 function test_0_defaults() {
248 verify(defaults.contentItem !== null, "Defaults is null");248 verify(defaults.contentItem !== null, "Defaults is null");
249 compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");249 compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default");
250 compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default")250 compare(defaults.highlightColor, theme.palette.highlighted.background, "theme.palette.selected.background color by default")
251 compare(defaults.highlighted, false, "Not highlighted by default");251 compare(defaults.highlighted, false, "Not highlighted by default");
252 compare(defaults.divider.visible, true, "divider is visible by default");252 compare(defaults.divider.visible, true, "divider is visible by default");
253 compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");253 compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0");

Subscribers

People subscribed via source and target branches