b89b226 · unity8 · git.iko.soy

on xenial help sign in

Merge

b89b226Albert Astals12 years ago

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

@@ -122,7 +122,7 @@ class DashEmulatorTestCase(tests.DashBaseTestCase):

122 self._assert_scope_is_opened(scope, scope_id)

123

124 def test_open_generic_scope(self):

125− scope_id = 'scopes'

125+ scope_id = 'musicaggregator'

126 scope = self.dash.open_scope(scope_id)

127 self._assert_scope_is_opened(scope, scope_id)

128 self.assertIsInstance(scope, dash_emulators.GenericScopeView)

tests/qmltests/Dash/tst_Dash.qml+8−1

@@ -232,7 +232,14 @@ Item {

232 tryCompare(dashContentList, "currentIndex", 1);

233

234 // 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);

236 var card2 = findChild(dashCategory2, "delegate2");

243 var card2 = findChild(dashCategory2, "delegate2");

237 waitForRendering(card2);

244 waitForRendering(card2);

238 mouseClick(card2, card2.width / 2, card2.height / 2);

245 mouseClick(card2, card2.width / 2, card2.height / 2);