git.iko.soy/unity8
on xenial help sign in
Merge
commitb89b226fab133aaae8ab6ebb0186737fd274d06e authorAlbert Astals <albert.astals@canonical.com> dateThu 7 Aug 2014, 10:17 (12 years ago) parentec07a742d7fbeb
2 files changed+9−2
compare with xenial
unifiedsplit
tests/autopilot/unity8/shell/tests/test_emulators.py+1−1 tests/qmltests/Dash/tst_Dash.qml+8−1
tests/autopilot/unity8/shell/tests/test_emulators.py+1−1
@@ -122,7 +122,7 @@ class DashEmulatorTestCase(tests.DashBaseTestCase):
122122 self._assert_scope_is_opened(scope, scope_id)
123123
124124 def test_open_generic_scope(self):
125− scope_id = 'scopes'
125+ scope_id = 'musicaggregator'
126126 scope = self.dash.open_scope(scope_id)
127127 self._assert_scope_is_opened(scope, scope_id)
128128 self.assertIsInstance(scope, dash_emulators.GenericScopeView)
tests/qmltests/Dash/tst_Dash.qml+8−1
@@ -232,7 +232,14 @@ Item {
232232 tryCompare(dashContentList, "currentIndex", 1);
233233
234234 // Click on card that opens temp scope
235− var dashCategory2 = findChild(dashContentList.currentItem, "dashCategory2");
235+ var categoryListView = findChild(dashContentList.currentItem, "categoryListView");
236+ var dashCategory2 = findChild(categoryListView, "dashCategory2");
237+ tryCompareFunction(function() {
238+ var d = findChild(dashCategory2, "delegate2");
239+ if (d) return true;
240+ categoryListView.contentY += 100;
241+ return false;
242+ }, true);
236243 var card2 = findChild(dashCategory2, "delegate2");
237244 waitForRendering(card2);
238245 mouseClick(card2, card2.width / 2, card2.height / 2);