on xenial help sign in
Finish things up.
commitaa7ce91df680a77366bb541129bd4d90fc9a5ecc authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 6 Sep 2013, 09:24 (13 years ago) parenta3e2868
4 files changed+13−7
Dash/Apps/RunningApplicationsGrid.qml−1 Dash/GenericScopeView.qml+2 tests/mocks/Unity/fake_applications_scope.cpp+7 tests/qmltests/tst_Shell.qml+4−6
Dash/Apps/RunningApplicationsGrid.qml−1
@@ -20,7 +20,6 @@ import "../../Components"
2020ResponsiveFlowView {
2121 id: root
2222 clip: true
23− objectName: "runningApplicationsGrid"
2423
2524 signal updateScreenshots
2625
Dash/GenericScopeView.qml+2
@@ -29,6 +29,8 @@ ScopeView {
2929
3030 onMovementStarted: categoryView.showHeader()
3131
32+ onPositionedAtBeginning: categoryView.positionAtBeginning()
33+
3234 Binding {
3335 target: scopeView.scope
3436 property: "searchQuery"
tests/mocks/Unity/fake_applications_scope.cpp+7
@@ -64,5 +64,12 @@ DeeModel* ApplicationsScope::createCategoriesModel()
6464 "grid",
6565 hints);
6666
67+ dee_model_append(category_model,
68+ "outdated",
69+ "Outdaded",
70+ "gtk-apply",
71+ "grid",
72+ hints);
73+
6774 return category_model;
6875}
tests/qmltests/tst_Shell.qml+4−6
@@ -63,11 +63,6 @@ Item {
6363 var homeLoader = findChild(dashContentList, "home.scope loader");
6464 verify(homeLoader);
6565 tryCompareFunction(function() {return homeLoader.item !== undefined;}, true);
66−
67− // FIXME: Desperate measure to ensure Jenkins has the scene graph fully loaded
68− // before it calls the test functions (otherwise findChild calls will fail).
69− // The code above just didn't solve it.
70− wait(2000);
7166 }
7267
7368 function cleanup() {
@@ -247,6 +242,7 @@ Item {
247242
248243 // swipe finger up until the running/recent apps section (which we assume
249244 // it's the first one) is as far from view as possible.
245+ // We also assume that DashApps is tall enough that it's scrollable
250246 var appsCategoryListView = findChild(dashApps, "categoryListView");
251247 while (!appsCategoryListView.atYEnd) {
252248 swipeUpFromCenter();
@@ -274,7 +270,9 @@ Item {
274270 tryCompare(appsCategoryListView, "moving", false);
275271
276272 verify(itemIsOnScreen(dashApps));
277− var runningApplicationsGrid = findChild(dashApps, "runningApplicationsGrid");
273+
274+ var runningApplicationsGrid = findChild(appsCategoryListView, "recent");
275+ verify(runningApplicationsGrid);
278276 verify(itemIsOnScreen(runningApplicationsGrid));
279277 }
280278