Unity 8

Merge lp:~aacid/unity8/unstable_departments_test into lp:unity8

Proposed by Albert Astals Cid on 2014-08-06

Status:	Merged
Approved by:	Michał Sawicz on 2014-08-06
Approved revision:	1112
Merged at revision:	1126
Proposed branch:	lp:~aacid/unity8/unstable_departments_test
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/dashSepartmentsListTweaks
Diff against target:	16 lines (+4/-2) 1 file modified tests/qmltests/Dash/tst_DashContent.qml (+4/-2)
To merge this branch:	bzr merge lp:~aacid/unity8/unstable_departments_test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-08-06	Approve on 2014-08-06
Michał Sawicz			Approve on 2014-08-06
Ying-Chun Liu		2014-08-06	Pending
Review via email: mp+229757@code.launchpad.net

This proposal supersedes a proposal from 2014-08-04.

Make test_departments test more stable

There's various DashDepartments on the dash, make sure we're working
over the one that is on screen, otherwise clicks don't end up where
they should

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, test seems more stable now

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

Revision history for this message

Ying-Chun Liu (paulliu) wrote on 2014-08-04: Posted in a previous version of this proposal

Nice catch.

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
wait

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04: Posted in a previous version of this proposal

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-05: Posted in a previous version of this proposal

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-06:

Still good.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-06:

review: Approve (continuous-integration)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
2	--- tests/qmltests/Dash/tst_DashContent.qml 2014-07-21 13:28:35 +0000
3	+++ tests/qmltests/Dash/tst_DashContent.qml 2014-08-06 10:14:49 +0000
4	@@ -269,8 +269,10 @@
5	}
6
7	function test_departments() {
8	- var dashDepartments = findChild(dashContent, "dashDepartments");
9	- compare(dashDepartments.visible, true);
10	+ var dashContentList = findChild(dashContent, "dashContentList");
11	+ tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashDepartments") != null; }, true);
12	+ var dashDepartments = findChild(dashContentList.currentItem, "dashDepartments");
13	+ tryCompare(dashDepartments, "visible", true);
14	compare(dashDepartments.showList, false);
15	waitForRendering(dashDepartments);
16	mouseClick(dashDepartments, 0, 0);