AP, test dash: fix issues on refactoring

Properly click object and return geometry of the view (controller has no geo) (bzr r3987.1.10)

2 files changed, 4 insertions, 4 deletions

diff --git a/tests/autopilot/unity/emulators/dash.py b/tests/autopilot/unity/emulators/dash.py
index 667da775d..b2d5f469d 100644
--- a/tests/autopilot/unity/emulators/dash.py
+++ b/tests/autopilot/unity/emulators/dash.py
@@ -158,7 +158,7 @@ class DashController(UnityIntrospectionObject, KeybindingsHelper):
 
 @property
 def geometry(self):
- return self.globalRect
+ return self.view.globalRect
 
 
 class DashView(UnityIntrospectionObject):
@@ -463,7 +463,7 @@ class PreviewContainer(UnityIntrospectionObject):
 def navigate_left(self, count=1):
 """Navigate preview left"""
 m = Mouse.create()
- m.move_to_object(self.get_left_navigator())
+ m.move_to_object(self.get_left_navigator().button_geo)
 
 old_preview_initiate_count = self.preview_initiate_count
 
@@ -476,7 +476,7 @@ class PreviewContainer(UnityIntrospectionObject):
 def navigate_right(self, count=1):
 """Navigate preview right"""
 m = Mouse.create()
- m.move_to_object(self.get_right_navigator())
+ m.move_to_object(self.get_right_navigator().button_geo)
 
 old_preview_initiate_count = self.preview_initiate_count
 
diff --git a/tests/autopilot/unity/tests/test_dash.py b/tests/autopilot/unity/tests/test_dash.py
index b2befa799..24b3a2c01 100644
--- a/tests/autopilot/unity/tests/test_dash.py
+++ b/tests/autopilot/unity/tests/test_dash.py
@@ -1112,7 +1112,7 @@ class PreviewNavigateTests(DashTestCase):
 cover_art = self.get_current_preview().cover_art[0]
 
 # click the cover-art (this will set focus)
- self.click_object(cover_art)
+ self.mouse.click_object(cover_art)
 
 self.keyboard.press_and_release("Escape")