Merge lp:~aacid/unity8/bottom_list_drag into lp:unity8

[Albert Astals Cid]

Fix clicking on the manage dash list after having moved the current scope

Comes with a test for that and for a other manage dash scope move situation
And removes unused code from the test

 * Are there any related MPs required for this MP to build/function as expected?
Prerequisite

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/bottom_list_drag]

1504. By Albert Astals Cid on 2014-12-12

comment++

1505. By Albert Astals Cid on 2014-12-12

fix comment

1506. By Albert Astals Cid on 2014-12-12

settle animation before clicking

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

not yet. but tests pass for me here

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-12-11 13:25:10 +0000
+++ qml/Dash/Dash.qml	2014-12-12 12:14:51 +0000
@@ -75,6 +75,7 @@
             return
         }
 
+        dashContent.workaroundRestoreIndex = -1;
         dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
     }
 

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-12 12:14:51 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-12 12:14:51 +0000
@@ -70,19 +70,6 @@
             waitForRendering(findChild(dash, "scopeLoader0").item);
         }
 
-        function get_scope_data() {
-            return [
-                        { tag: "MockScope1", visualIndex: 0 },
-                        { tag: "MockScope2", visualIndex: -1 },
-                        { tag: "clickscope", visualIndex: 1 },
-                        { tag: "MockScope5", visualIndex: 2 },
-            ]
-        }
-
-        function test_show_scope_on_load_data() {
-            return get_scope_data()
-        }
-
         function test_manage_dash_clickscope_unfavoritable() {
             // Show the manage dash
             touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
@@ -330,7 +317,7 @@
             spy.target = scopesList.scope;
             spy.signalName = "performQuery";
 
-            // Do a search
+            // Click on the store
             var scopesListPageHeader = findChild(scopesList, "pageHeader");
             var searchButton = findChild(scopesListPageHeader, "store_header_button");
             mouseClick(searchButton, 0, 0);
@@ -339,5 +326,90 @@
             compare(spy.signalArguments[0][0], "scope://com.canonical.scopes.clickstore");
             tryCompare(bottomEdgeController, "progress", 0);
         }
+
+        function test_manage_dash_move_current() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            // Make sure stuff is loaded
+            var favScopesListCategory = findChild(dash, "scopesListCategoryfavorites");
+            var favScopesListCategoryList = findChild(favScopesListCategory, "scopesListCategoryInnerList");
+            tryCompare(favScopesListCategoryList, "currentIndex", 0);
+
+            // Enter edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
+            mousePress(clickScope, 0, 0);
+            tryCompare(scopesList, "state", "edit");
+            mouseRelease(clickScope, 0, 0);
+
+            var starArea = findChild(clickScope, "starArea");
+            touchFlick(starArea, 0, 0, 0, -units.gu(10));
+
+            // Exit edit mode and go back
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+            mouseClick(backButton, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+
+            tryCompare(dashContentList, "currentIndex", 0);
+            compare(dashContentList.currentItem.scopeId, "clickscope");
+
+            // Move to second scope
+            touchFlick(dash, dash.width / 2, units.gu(2), dash.width / 5, units.gu(2));
+            tryCompare(dashContentList, "currentIndex", 1);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+        }
+
+        function test_manage_dash_move_current_click_other() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            // Make sure stuff is loaded
+            var favScopesListCategory = findChild(dash, "scopesListCategoryfavorites");
+            var favScopesListCategoryList = findChild(favScopesListCategory, "scopesListCategoryInnerList");
+            tryCompare(favScopesListCategoryList, "currentIndex", 0);
+
+            // Enter edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
+            mousePress(clickScope, 0, 0);
+            tryCompare(scopesList, "state", "edit");
+            mouseRelease(clickScope, 0, 0);
+
+            var starArea = findChild(clickScope, "starArea");
+            touchFlick(starArea, 0, 0, 0, -units.gu(10));
+
+            // wait for the animation to settle
+            tryCompare(clickScope, "height", units.gu(6));
+
+            // Exit edit mode
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Click on third scope
+            var mockScope5 = findChild(favScopesListCategoryList, "delegateMockScope5");
+            waitForRendering(mockScope5)
+            mouseClick(mockScope5, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+            tryCompare(dashContentList, "currentIndex", 2);
+            compare(dashContentList.currentItem.scopeId, "MockScope5");
+        }
     }
 }