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

[Albert Astals Cid]

Manage Dash: Make store button work even if you have no favorites

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

 * 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

[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.
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve

[Michał Sawicz (saviq)]

Can we have a test for this?

review: Needs Information

[lp:~aacid/unity8/bottom_list_store_no_favorites]

1484. By Albert Astals Cid on 2014-12-10

Add test

[Albert Astals Cid (aacid)]

Added test

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-12-03 07:44:46 +0000
+++ qml/Dash/Dash.qml	2014-12-10 09:07:28 +0000
@@ -167,7 +167,7 @@
         onStoreClicked: {
             bottomEdgeController.enableAnimation = true;
             bottomEdgeController.progress = 0;
-            dashContent.currentScope.performQuery("scope://com.canonical.scopes.clickstore");
+            scopesList.scope.performQuery("scope://com.canonical.scopes.clickstore");
         }
         onRequestFavorite: {
             scopes.setFavorite(scopeId, favorite);

=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2014-10-30 12:06:59 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2014-12-10 09:07:28 +0000
@@ -88,6 +88,18 @@
     }
 }
 
+void Scopes::clearFavorites()
+{
+    if (m_scopes.size() > 0) {
+        beginRemoveRows(QModelIndex(), 0, m_scopes.count()-1);
+        Q_FOREACH(Scope *scope, m_scopes) {
+            m_scopesOverview->setFavorite(scope, false);
+        }
+        m_scopes.clear();
+        endRemoveRows();
+    }
+}
+
 void Scopes::load()
 {
     timer.start();

=== modified file 'tests/mocks/Unity/fake_scopes.h'
--- tests/mocks/Unity/fake_scopes.h	2014-10-22 13:59:54 +0000
+++ tests/mocks/Unity/fake_scopes.h	2014-12-10 09:07:28 +0000
@@ -46,6 +46,7 @@
     Q_INVOKABLE void addScope(Scope* scope);
 
     Q_INVOKABLE void clear();
+    Q_INVOKABLE void clearFavorites();
     Q_INVOKABLE void load();
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-03 07:44:46 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-10 09:07:28 +0000
@@ -38,6 +38,10 @@
         anchors.fill: parent
     }
 
+    SignalSpy {
+        id: spy
+    }
+
     UT.UnityTestCase {
         name: "Dash"
         when: windowShown
@@ -262,5 +266,30 @@
             currentScope.setSearchInProgress(false);
             tryCompare(processingIndicator, "visible", false);
         }
+
+        function test_manage_dash_store_no_favorites() {
+            // 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);
+
+            // clear the favorite scopes
+            scopes.clearFavorites();
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 0);
+
+            var scopesList = findChild(dash, "scopesList");
+            spy.target = scopesList.scope;
+            spy.signalName = "performQuery";
+
+            // Do a search
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var searchButton = findChild(scopesListPageHeader, "store_header_button");
+            mouseClick(searchButton, 0, 0);
+
+            spy.wait();
+            compare(spy.signalArguments[0][0], "scope://com.canonical.scopes.clickstore");
+            tryCompare(bottomEdgeController, "progress", 0);
+        }
     }
 }