on xenial help sign in
revert revision 304 as it makes the Shell crash.

Approved by PS Jenkins bot, Michał Sawicz.

commit8b02a3bbbf3df429857a2efd385885131b8505a6 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 10 Sep 2013, 08:15 (13 years ago) parenta0203215eaf63a
6 files changed+1−81
Dash/DashApps.qml−1 Dash/DashContent.qml−1 Dash/GenericScopeView.qml−3 Shell.qml+1−1 tests/mocks/Unity/fake_applications_scope.cpp−7 tests/qmltests/tst_Shell.qml−68
Dash/DashApps.qml−1
@@ -24,7 +24,6 @@ import "Apps"
2424
2525GenericScopeView {
2626 id: scopeView
27− objectName: "DashApps"
2827
2928 // FIXME: a way to aggregate these models would be ideal
3029 property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
Dash/DashContent.qml−1
@@ -114,7 +114,6 @@ Item {
114114 height: ListView.view.height
115115 asynchronous: true
116116 source: scopeMapper.map(scope.id)
117− objectName: scope.id + " loader"
118117
119118 // these are needed for autopilot tests
120119 readonly property string scopeId: scope.id
Dash/GenericScopeView.qml−3
@@ -29,8 +29,6 @@ ScopeView {
2929
3030 onMovementStarted: categoryView.showHeader()
3131
32− onPositionedAtBeginning: categoryView.positionAtBeginning()
33−
3432 Binding {
3533 target: scopeView.scope
3634 property: "searchQuery"
@@ -47,7 +45,6 @@ ScopeView {
4745
4846 ScopeListView {
4947 id: categoryView
50− objectName: "categoryListView"
5148 anchors.fill: parent
5249 model: scopeView.categories
5350 forceNoClip: previewLoader.onScreen
Shell.qml+1−1
@@ -640,7 +640,7 @@ FocusScope {
640640 }
641641 onDash: {
642642 if (stages.shown) {
643− dash.setCurrentScope("applications.scope", true /* animate */, true /* reset */)
643+ dash.setCurrentScope("applications.scope", true, false)
644644 stages.hide();
645645 launcher.hide();
646646 }
tests/mocks/Unity/fake_applications_scope.cpp−7
@@ -64,12 +64,5 @@ 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−
7467 return category_model;
7568}
tests/qmltests/tst_Shell.qml−68
@@ -56,18 +56,6 @@ Item {
5656
5757 function initTestCase() {
5858 swipeAwayGreeter();
59−
60− // Ensure DashHome is loaded before continuing
61− var dashContentList = findChild(shell, "dashContentList");
62− waitForRendering(dashContentList);
63− var homeLoader = findChild(dashContentList, "home.scope loader");
64− verify(homeLoader);
65− 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);
7159 }
7260
7361 function cleanup() {
@@ -225,62 +213,6 @@ Item {
225213 tryCompare(dash, "visible", false);
226214 }
227215
228− /*
229− Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419
230−
231− When the user minimizes an application (left-edge swipe) he should always end up in the "Running Apps"
232− category of the "Applications" scope view.
233−
234− Steps:
235− - go to apps lens
236− - scroll to the bottom
237− - reveal launcher and launch an app
238− - perform long left edge swipe to go minimize the app and go back to the dash.
239−
240− Expected Results
241− - apps lens shown and Running Apps visible on screen
242− */
243− function test_minimizingAppTakesToRunningApps() {
244− var dashApps = findChild(shell, "DashApps");
245−
246− swipeUntilScopeViewIsReached(dashApps);
247−
248− // swipe finger up until the running/recent apps section (which we assume
249− // it's the first one) is as far from view as possible.
250− // We also assume that DashApps is tall enough that it's scrollable
251− var appsCategoryListView = findChild(dashApps, "categoryListView");
252− while (!appsCategoryListView.atYEnd) {
253− swipeUpFromCenter();
254− tryCompare(appsCategoryListView, "moving", false);
255− }
256−
257− // Switch away from the Applications scope.
258− swipeRightFromCenter();
259− waitUntilItemStopsMoving(dashApps);
260− verify(!itemIsOnScreen(dashApps));
261−
262− dragLauncherIntoView();
263−
264− // Launch an app from the launcher
265− tapOnAppIconInLauncher();
266−
267− waitUntilApplicationWindowIsFullyVisible();
268−
269− // Minimize the application we just launched
270− swipeFromLeftEdge();
271−
272− // Wait for the whole UI to settle down
273− waitUntilApplicationWindowIsFullyHidden();
274− waitUntilItemStopsMoving(dashApps);
275− tryCompare(appsCategoryListView, "moving", false);
276−
277− verify(itemIsOnScreen(dashApps));
278−
279− var runningApplicationsGrid = findChild(appsCategoryListView, "recent");
280− verify(runningApplicationsGrid);
281− verify(itemIsOnScreen(runningApplicationsGrid));
282− }
283−
284216 // Wait for the whole UI to settle down
285217 function waitForUIToSettle() {
286218 waitUntilApplicationWindowIsFullyHidden();