Unity

Merge lp://qastaging/~azzar1/unity/fix-839472 into lp://qastaging/unity

fix-839472
Merge into trunk

Proposed by Andrea Azzarone on 2012-04-17

Status:

Merged

Approved by:

Andrea Azzarone on 2012-04-18

Approved revision:

no longer in the source branch.

Merged at revision:

2305

Proposed branch:

lp://qastaging/~azzar1/unity/fix-839472

Merge into:

lp://qastaging/unity

Diff against target:

125 lines (+67/-1)

4 files modified

plugins/unityshell/src/DashStyle.cpp (+10/-0)
plugins/unityshell/src/DashStyle.h (+3/-0)
plugins/unityshell/src/DashView.cpp (+14/-1)
tests/autopilot/autopilot/tests/test_dash.py (+40/-0)

To merge this branch:

bzr merge lp://qastaging/~azzar1/unity/fix-839472

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tim Penhey (community)		2012-04-17	Approve on 2012-04-18
Review via email: mp+102247@code.qastaging.launchpad.net

Commit message

Don't close the dash if the click is inside the desktop dash border.

Description of the change

== Problem ==
Dash - Clicking on the desktop dash border should do nothing, *NOT* close the dash.

== Test ==
AP test added.

Revision history for this message

Tim Penhey (thumper) wrote on 2012-04-18:

We shouldn't silently pass the tests if not in desktop form factor, but instead use:
self.skip("Not in desktop form-factor.")

Also, instead of:
sleep(1);
self.assertTrue(self.dash.visible)

you can now use Thomi's

self.assertThat(self.dash.visible, Eventually(Equals(True)))

review: Needs Fixing

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2012-04-18:

> We shouldn't silently pass the tests if not in desktop form factor, but
> instead use:
> self.skip("Not in desktop form-factor.")
>
> Also, instead of:
> sleep(1);
> self.assertTrue(self.dash.visible)
>
> you can now use Thomi's
>
> self.assertThat(self.dash.visible, Eventually(Equals(True)))