=== modified file 'tests/autopilot/filemanager/__init__.py' --- tests/autopilot/filemanager/__init__.py 2014-11-19 20:24:25 +0000 +++ tests/autopilot/filemanager/__init__.py 2014-11-19 21:23:13 +0000 @@ -71,13 +71,10 @@
def get_folder_list_page(self): """Return the FolderListPage emulator of the MainView.""" - page = self.wait_select_single(FolderListPage) - page.main_view = self - return page + return self.wait_select_single(FolderListPage)
def _go_to_place_from_places_page(self, object_name): placespage = self.open_places() - self.placespage.active.wait_for(True) placespage.go_to_place(object_name)
@autopilot.logging.log_action(logger.info) @@ -107,9 +104,9 @@ logger.error('BottomEdge element not found.') raise
- self.wait_select_single( - "QQuickFlickable", objectName="placesFlickable")\ - .dragging.wait_for(False) + flickable = self.wait_select_single( + "QQuickFlickable", objectName="placesFlickable") + flickable.wait_until_destroyed()
@autopilot.logging.log_action(logger.info) def rename(self, original_name, new_name):
« Back to merge proposal
=== modified file 'tests/ autopilot/ filemanager/ __init_ _.py' /filemanager/ __init_ _.py 2014-11-19 20:24:25 +0000 /filemanager/ __init_ _.py 2014-11-19 21:23:13 +0000
--- tests/autopilot
+++ tests/autopilot
@@ -71,13 +71,10 @@
def get_folder_ list_page( self): select_ single( FolderListPage) select_ single( FolderListPage)
"""Return the FolderListPage emulator of the MainView."""
- page = self.wait_
- page.main_view = self
- return page
+ return self.wait_
def _go_to_ place_from_ places_ page(self, object_name): .active. wait_for( True)
placespage. go_to_place( object_ name)
placespage = self.open_places()
- self.placespage
@autopilot .logging. log_action( logger. info)
logger. error(' BottomEdge element not found.')
@@ -107,9 +104,9 @@
raise
- self.wait_ select_ single( "placesFlickabl e")\ wait_for( False) select_ single( "placesFlickabl e") wait_until_ destroyed( )
- "QQuickFlickable", objectName=
- .dragging.
+ flickable = self.wait_
+ "QQuickFlickable", objectName=
+ flickable.
@autopilot .logging. log_action( logger. info)
def rename(self, original_name, new_name):