4c82491 · unity8 · git.iko.soy

qml/Dash/DashContent.qml+1−1

@@ -160,7 +160,7 @@ Item {

160 }

161 asynchronous: true

162 source: "GenericScopeView.qml"

163− objectName: scope.id + " loader"

163+ objectName: "scopeLoader" + index

164

165 readonly property bool moving: item ? item.moving : false

166 readonly property bool navigationShown: item ? item.navigationShown : false

tests/autopilot/unity8/shell/emulators/dash.py+4

@@ -69,6 +69,10 @@ class Dash(emulators.UnityEmulatorBase):

69 return self.dash_content_list.wait_select_single(

70 'QQuickLoader', scopeId=scope_name)

71

72+ def get_scope_by_index(self, scope_index=0):

73+ return self.dash_content_list.wait_select_single(

74+ 'QQuickLoader', objectName=("scopeLoader%i" % scope_index))

75+

72 @autopilot_logging.log_action(logger.info)

76 @autopilot_logging.log_action(logger.info)

73 def open_scope(self, scope_id):

77 def open_scope(self, scope_id):

74 """Open a dash scope.

78 """Open a dash scope.

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -447,7 +447,7 @@ class DashBaseTestCase(AutopilotTestCase):

447 return launch_dash_app_fixture.application_proxy

448

449 def wait_for_dash(self):

450− home_scope = self.dash.get_scope('clickscope')

450+ home_scope = self.dash.get_scope_by_index(0)

451 # FIXME! There is a huge timeout here for when we're doing CI on

452 # VMs. See lp:1203715

453 self.assertThat(