git.iko.soy/unity8
on xenial help sign in
make AP work based on index too
commit4c824915a0fb703f5868746e5f2fb4980cb56ec2 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 30 Oct 2014, 15:38 (12 years ago) parenta3cc5b0
3 files changed+6−2
compare with xenial
unifiedsplit
qml/Dash/DashContent.qml+1−1 tests/autopilot/unity8/shell/emulators/dash.py+4 tests/autopilot/unity8/shell/tests/__init__.py+1−1
qml/Dash/DashContent.qml+1−1
@@ -160,7 +160,7 @@ Item {
160160 }
161161 asynchronous: true
162162 source: "GenericScopeView.qml"
163− objectName: scope.id + " loader"
163+ objectName: "scopeLoader" + index
164164
165165 readonly property bool moving: item ? item.moving : false
166166 readonly property bool navigationShown: item ? item.navigationShown : false
tests/autopilot/unity8/shell/emulators/dash.py+4
@@ -69,6 +69,10 @@ class Dash(emulators.UnityEmulatorBase):
6969 return self.dash_content_list.wait_select_single(
7070 'QQuickLoader', scopeId=scope_name)
7171
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+
7276 @autopilot_logging.log_action(logger.info)
7377 def open_scope(self, scope_id):
7478 """Open a dash scope.
tests/autopilot/unity8/shell/tests/__init__.py+1−1
@@ -447,7 +447,7 @@ class DashBaseTestCase(AutopilotTestCase):
447447 return launch_dash_app_fixture.application_proxy
448448
449449 def wait_for_dash(self):
450− home_scope = self.dash.get_scope('clickscope')
450+ home_scope = self.dash.get_scope_by_index(0)
451451 # FIXME! There is a huge timeout here for when we're doing CI on
452452 # VMs. See lp:1203715
453453 self.assertThat(