Merge lp:~stolowski/unity-scopes-shell/manage-dash-rtm into lp:unity-scopes-shell/rtm-14.09

[Paweł Stołowski]

Support for Manage Dash as per latest designs (cherry-picked from trunk rev. 173).

Support for Manage Dash as per latest designs (cherry-picked from trunk rev. 173).

[Michał Sawicz (saviq)]

review: Needs Fixing

[Michał Sawicz (saviq)]

As per upstream changes.

review: Approve

[lp:~stolowski/unity-scopes-shell/manage-dash-rtm]

137. By Paweł Stołowski on 2014-12-16

Merged rtm-14.09

=== modified file 'debian/control'
--- debian/control	2014-10-22 15:48:29 +0000
+++ debian/control	2014-12-16 16:01:50 +0000
@@ -3,8 +3,8 @@
 Section: libs
 Build-Depends: cmake,
                debhelper (>= 9),
-               libunity-api-dev (>= 7.88),
-               libunity-scopes-dev (>= 0.6.8~),
+               libunity-api-dev (>= 7.94~),
+               libunity-scopes-dev (>= 0.6.9~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
@@ -37,7 +37,8 @@
           unity-scopes-impl-0,
           unity-scopes-impl-1,
           unity-scopes-impl-4,
-Breaks: unity8-private (<< 7.84)
+Breaks: unity8-private (<< 7.84),
+        unity8 (<< 8.02)
 Replaces: unity8-private (<< 7.84)
 Description: QML plugin for Scopes
  Plugin to integrate scopes with the Unity shell

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-10-22 15:48:29 +0000
+++ src/Unity/CMakeLists.txt	2014-12-16 16:01:50 +0000
@@ -2,8 +2,8 @@
 include(Plugins)
 
 # Dependencies
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.8)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=5)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.9)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
 pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)

=== modified file 'src/Unity/overviewcategories.cpp'
--- src/Unity/overviewcategories.cpp	2014-08-18 09:15:12 +0000
+++ src/Unity/overviewcategories.cpp	2014-12-16 16:01:50 +0000
@@ -52,11 +52,11 @@
     : scopes_ng::Categories(parent)
     , m_isSurfacing(true)
 {
-    m_allScopes.reset(new OverviewResultsModel(this));
+    m_otherScopes.reset(new OverviewResultsModel(this));
     m_favoriteScopes.reset(new OverviewResultsModel(this));
 
     m_surfaceCategories.append(QSharedPointer<ScopesCategoryData>(new ScopesCategoryData("favorites", CATEGORY_JSON)));
-    m_surfaceCategories.append(QSharedPointer<ScopesCategoryData>(new ScopesCategoryData("all", CATEGORY_JSON)));
+    m_surfaceCategories.append(QSharedPointer<ScopesCategoryData>(new ScopesCategoryData("other", CATEGORY_JSON)));
 }
 
 OverviewCategories::~OverviewCategories()
@@ -72,9 +72,9 @@
     }
 }
 
-void OverviewCategories::setAllScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes)
+void OverviewCategories::setOtherScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName)
 {
-    m_allScopes->setResults(scopes);
+    m_otherScopes->setResults(scopes, scopeIdToName);
 
     if (!m_isSurfacing) return;
 
@@ -85,9 +85,9 @@
     dataChanged(changedIndex, changedIndex, roles);
 }
 
-void OverviewCategories::setFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes)
+void OverviewCategories::setFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName)
 {
-    m_favoriteScopes->setResults(scopes);
+    m_favoriteScopes->setResults(scopes, scopeIdToName);
 
     if (!m_isSurfacing) return;
 
@@ -98,9 +98,14 @@
     dataChanged(changedIndex, changedIndex, roles);
 }
 
-void OverviewCategories::updateFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes)
-{
-    m_favoriteScopes->setResults(scopes);
+void OverviewCategories::updateOtherScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName)
+{
+    m_otherScopes->setResults(scopes, scopeIdToName);
+}
+
+void OverviewCategories::updateFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName)
+{
+    m_favoriteScopes->setResults(scopes, scopeIdToName);
 }
 
 int OverviewCategories::rowCount(const QModelIndex& parent) const
@@ -120,7 +125,7 @@
     }
 
     ScopesCategoryData* catData = m_surfaceCategories.at(index.row()).data();
-    OverviewResultsModel* results = index.row() == 0 ? m_favoriteScopes.data() : m_allScopes.data();
+    OverviewResultsModel* results = index.row() == 0 ? m_favoriteScopes.data() : m_otherScopes.data();
 
     switch (role) {
         case RoleCategoryId:

=== modified file 'src/Unity/overviewcategories.h'
--- src/Unity/overviewcategories.h	2014-08-18 09:15:12 +0000
+++ src/Unity/overviewcategories.h	2014-12-16 16:01:50 +0000
@@ -44,15 +44,16 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    void setAllScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes);
-    void setFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes);
-    void updateFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes);
+    void setOtherScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName);
+    void setFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName);
+    void updateOtherScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName);
+    void updateFavoriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes, const QMap<QString, QString>& scopeIdToName);
 
 private:
     bool m_isSurfacing;
 
     QList<QSharedPointer<ScopesCategoryData>> m_surfaceCategories;
-    QScopedPointer<OverviewResultsModel> m_allScopes;
+    QScopedPointer<OverviewResultsModel> m_otherScopes;
     QScopedPointer<OverviewResultsModel> m_favoriteScopes;
 };
 

=== modified file 'src/Unity/overviewresults.cpp'
--- src/Unity/overviewresults.cpp	2014-08-25 09:51:13 +0000
+++ src/Unity/overviewresults.cpp	2014-12-16 16:01:50 +0000
@@ -67,19 +67,25 @@
 {
 }
 
-void OverviewResultsModel::setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results)
+void OverviewResultsModel::setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results, const QMap<QString, QString>& scopeIdToName)
 {
     if (m_results.empty()) {
         beginResetModel();
         m_results = results;
+        for (auto const newRes: results)
+        {
+            updateChildScopes(newRes, scopeIdToName);
+        }
+
         endResetModel();
         Q_EMIT countChanged();
         return;
     }
 
-    QSet<QString> newResult;
+    int pos = 0;
+    QMap<QString, int> newResult;
     for (auto const res: results) {
-        newResult.insert(QString::fromStdString(res->scope_id()));
+        newResult[QString::fromStdString(res->scope_id())] = pos++;
     }
 
     // itearate over old results, remove rows that are not present in new results
@@ -105,6 +111,7 @@
     row = 0;
     for (auto const newRes: results)
     {
+        updateChildScopes(newRes, scopeIdToName);
         if (!oldResult.contains(QString::fromStdString(newRes->scope_id())))
         {
             beginInsertRows(QModelIndex(), row, row);
@@ -113,9 +120,49 @@
         }
         ++row;
     }
+
+    // iterate over results, move rows if positions changes
+    for (int i = 0; i<m_results.size(); )
+    {
+        auto scope_meta = m_results.at(i);
+        const QString id = QString::fromStdString(scope_meta->scope_id());
+        if (newResult.contains(id)) {
+            pos = newResult[id];
+            if (pos != i) {
+                beginMoveRows(QModelIndex(), i, i, QModelIndex(), pos + (pos > i ? 1 : 0));
+                m_results.move(i, pos);
+                endMoveRows();
+                continue;
+            }
+        }
+        i++;
+    }
+
     Q_EMIT countChanged();
 }
 
+void OverviewResultsModel::updateChildScopes(const unity::scopes::ScopeMetadata::SPtr& scopeMetadata, const QMap<QString, QString>& scopeIdToName)
+{
+    auto const children = scopeMetadata->child_scope_ids();
+    if (children.size())
+    {
+        // iterate over child scope ids, join their display names and insert into m_childScopes for current scope
+        QStringList childNames;
+        for (auto const& id: children)
+        {
+            auto it = scopeIdToName.find(QString::fromStdString(id));
+            if (it != scopeIdToName.end())
+            {
+                childNames << *it;
+            }
+        }
+        if (!childNames.empty())
+        {
+            m_childScopes[QString::fromStdString(scopeMetadata->scope_id())] = childNames.join(", ");
+        }
+    }
+}
+
 QString OverviewResultsModel::categoryId() const
 {
     return QString();
@@ -190,8 +237,14 @@
             }
             return QString::fromStdString(art);
         }
-        case RoleSubtitle:
+        case RoleSubtitle: {
+            auto it = m_childScopes.find(QString::fromStdString(metadata->scope_id()));
+            if (it != m_childScopes.end())
+            {
+                return *it;
+            }
             return QVariant();
+        }
         case RoleMascot:
             return QVariant();
         case RoleEmblem:

=== modified file 'src/Unity/overviewresults.h'
--- src/Unity/overviewresults.h	2014-07-18 10:23:07 +0000
+++ src/Unity/overviewresults.h	2014-12-16 16:01:50 +0000
@@ -25,6 +25,7 @@
 #include <unity/scopes/ScopeMetadata.h>
 
 #include <QHash>
+#include <QMap>
 
 namespace scopes_ng {
 
@@ -39,7 +40,7 @@
 
     explicit OverviewResultsModel(QObject* parent = 0);
 
-    void setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results);
+    void setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results, const QMap<QString, QString>& scopeIdToName);
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
@@ -54,7 +55,9 @@
     Q_INVOKABLE int scopeIndex(const QString& scopeId) const;
 
 private:
+    void updateChildScopes(const unity::scopes::ScopeMetadata::SPtr& scopeMetadata, const QMap<QString, QString>& scopeIdToName);
     QList<unity::scopes::ScopeMetadata::SPtr> m_results;
+    QMap<QString, QString> m_childScopes;
 };
 
 } // namespace scopes_ng

=== modified file 'src/Unity/overviewscope.cpp'
--- src/Unity/overviewscope.cpp	2014-09-30 12:40:03 +0000
+++ src/Unity/overviewscope.cpp	2014-12-16 16:01:50 +0000
@@ -65,30 +65,13 @@
         return;
     }
 
-    QMap<QString, scopes::ScopeMetadata::SPtr> allMetadata = m_scopesInstance->getAllMetadata();
+    QMap<QString, QString> scopeIdToName;
     QList<scopes::ScopeMetadata::SPtr> favorites;
-    Q_FOREACH(QString id, m_scopesInstance->getFavoriteIds()) {
-        auto it = allMetadata.find(id);
-        if (it != allMetadata.end()) {
-            favorites.append(it.value());
-        }
-    }
-
-    QList<ScopeInfo> scopes;
-    Q_FOREACH(scopes::ScopeMetadata::SPtr const& metadata, allMetadata.values()) {
-        if (metadata->invisible()) continue;
-        scopes.append(ScopeInfo(metadata));
-    }
-    qSort(scopes.begin(), scopes.end());
-
-    QList<scopes::ScopeMetadata::SPtr> allScopes;
-    Q_FOREACH(ScopeInfo const& info, scopes) {
-        allScopes << info.data;
-    }
-
-    // FIXME: filter invisible scopes?
-    categories->setAllScopes(allScopes);
-    categories->setFavoriteScopes(favorites);
+    QList<scopes::ScopeMetadata::SPtr> otherScopes;
+    processFavorites(m_scopesInstance->getFavoriteIds(), favorites, otherScopes, scopeIdToName);
+    
+    categories->setFavoriteScopes(favorites, scopeIdToName);
+    categories->setOtherScopes(otherScopes, scopeIdToName);
 
     // Metadata has changed, invalidate the search results
     invalidateResults();
@@ -109,25 +92,52 @@
     }
 }
 
-void OverviewScope::updateFavorites(const QStringList& favorites)
+void OverviewScope::processFavorites(const QStringList& favs, QList<scopes::ScopeMetadata::SPtr>& favorites, QList<scopes::ScopeMetadata::SPtr>& otherScopes, QMap<QString, QString>& scopeIdToName)
 {
-    QList<scopes::ScopeMetadata::SPtr> favs;
     auto allMetadata = m_scopesInstance->getAllMetadata();
-    for (auto const id: favorites)
+
+    for (auto m: allMetadata)
+    {
+        scopeIdToName[QString::fromStdString(m->scope_id())] = QString::fromStdString(m->display_name());
+    }
+
+    for (auto const id: favs)
     {
         auto it = allMetadata.find(id);
         if (it != allMetadata.end()) {
-            favs.append(it.value());
+            favorites.append(it.value());
+            allMetadata.erase(it);
         }
     }
 
+    QList<ScopeInfo> scopes;
+    Q_FOREACH(scopes::ScopeMetadata::SPtr const& metadata, allMetadata.values()) {
+        if (metadata->invisible())
+            continue;
+        scopes.append(ScopeInfo(metadata));
+    }
+    qSort(scopes.begin(), scopes.end());
+
+    Q_FOREACH(ScopeInfo const& info, scopes) {
+        otherScopes << info.data;
+    }
+}
+
+void OverviewScope::updateFavorites(const QStringList& favs)
+{
     OverviewCategories* categories = qobject_cast<OverviewCategories*>(m_categories.data());
     if (!categories) {
         qWarning("Unable to cast m_categories to OverviewCategories");
         return;
     }
 
-    categories->updateFavoriteScopes(favs);
+    QMap<QString, QString> scopeIdToName;
+    QList<scopes::ScopeMetadata::SPtr> favorites;
+    QList<scopes::ScopeMetadata::SPtr> otherScopes;
+    processFavorites(favs, favorites, otherScopes, scopeIdToName);
+
+    categories->updateFavoriteScopes(favorites, scopeIdToName);
+    categories->updateOtherScopes(otherScopes, scopeIdToName);
 }
 
 void OverviewScope::dispatchSearch()

=== modified file 'src/Unity/overviewscope.h'
--- src/Unity/overviewscope.h	2014-08-13 15:46:55 +0000
+++ src/Unity/overviewscope.h	2014-12-16 16:01:50 +0000
@@ -44,6 +44,9 @@
 
 private Q_SLOTS:
     void metadataChanged();
+
+private:
+    void processFavorites(const QStringList& favs, QList<unity::scopes::ScopeMetadata::SPtr>& favorites, QList<unity::scopes::ScopeMetadata::SPtr>& otherScopes, QMap<QString, QString>& scopeIdToName);
 };
 
 } // namespace scopes_ng

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-12-10 16:45:40 +0000
+++ src/Unity/scopes.cpp	2014-12-16 16:01:50 +0000
@@ -390,17 +390,20 @@
     // notify about scopes model changes accordingly.
     if (m_dashSettings) {
         QStringList newFavorites;
-        QSet<QString> favScopesLut;
+        QMap<QString, int> favScopesLut;
         for (auto const& fv: m_dashSettings->get("favoriteScopes").toList())
         {
+            int pos = 0;
             try
             {
                 auto const query = unity::scopes::CannedQuery::from_uri(fv.toString().toStdString());
                 const QString id = QString::fromStdString(query.scope_id());
+
                 if (m_cachedMetadata.find(id) != m_cachedMetadata.end())
                 {
                     newFavorites.push_back(id);
-                    favScopesLut.insert(id);
+                    pos = newFavorites.size() - 1;
+                    favScopesLut[id] = pos;
                 }
                 else
                 {
@@ -471,6 +474,23 @@
             ++row;
             ++favIt;
         }
+
+        // iterate over results, move rows if positions changes
+        for (int i = 0; i<m_scopes.size(); )
+        {
+            auto scope = m_scopes.at(i);
+            const QString id = scope->id();
+            if (favScopesLut.contains(id)) {
+                int pos = favScopesLut[id];
+                if (pos != i) {
+                    beginMoveRows(QModelIndex(), i, i, QModelIndex(), pos + (pos > i ? 1 : 0));
+                    m_scopes.move(i, pos);
+                    endMoveRows();
+                    continue;
+                }
+            }
+            i++;
+        }
     }
 }
 
@@ -618,6 +638,39 @@
     }
 }
 
+void Scopes::moveFavoriteTo(QString const& scopeId, int index)
+{
+    if (m_dashSettings)
+    {
+        QStringList cannedQueries;
+        bool found = false;
+
+        int i = 0;
+        for (auto const& fav: m_favoriteScopes)
+        {
+            if (fav == scopeId) {
+                if (index == i)
+                    return; // same position
+                found = true;
+            } else {
+                const QString query = "scope://" + fav;
+                cannedQueries.push_back(query);
+            }
+
+            ++i;
+        }
+
+        if (found) {
+            // insert scopeId at new position
+            const QString query = "scope://" + scopeId;
+            cannedQueries.insert(index, query);
+            // update gsettings entry
+            // note: this will trigger notification, so that new favorites are processed by processFavoriteScopes
+            m_dashSettings->set("favoriteScopes", QVariant(cannedQueries));
+        }
+    }
+}
+
 QMap<QString, unity::scopes::ScopeMetadata::SPtr> Scopes::getAllMetadata() const
 {
     return m_cachedMetadata;

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2014-11-05 16:47:40 +0000
+++ src/Unity/scopes.h	2014-12-16 16:01:50 +0000
@@ -61,7 +61,8 @@
     unity::scopes::ScopeMetadata::SPtr getCachedMetadata(QString const& scopeId) const;
     QMap<QString, unity::scopes::ScopeMetadata::SPtr> getAllMetadata() const;
     QStringList getFavoriteIds() const;
-    void setFavorite(QString const& scopeId, bool value);
+    Q_INVOKABLE void setFavorite(QString const& scopeId, bool value) override;
+    Q_INVOKABLE void moveFavoriteTo(QString const& scopeId, int index) override;
 
     void refreshScopeMetadata();
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-15 12:03:13 +0000
+++ tests/CMakeLists.txt	2014-12-16 16:01:50 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=5)
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.2)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)

=== modified file 'tests/data/mock-scope-departments/mock-scope-departments.ini.in'
--- tests/data/mock-scope-departments/mock-scope-departments.ini.in	2014-06-02 14:36:07 +0000
+++ tests/data/mock-scope-departments/mock-scope-departments.ini.in	2014-12-16 16:01:50 +0000
@@ -6,3 +6,4 @@
 SearchHint = mock-departments.SearchHint
 HotKey = mock-departments.HotKey
 Author = mock-departments.Author
+ChildScopes = mock-scope-double-nav;mock-scope

=== modified file 'tests/favoritestest.cpp'
--- tests/favoritestest.cpp	2014-09-29 14:25:10 +0000
+++ tests/favoritestest.cpp	2014-12-16 16:01:50 +0000
@@ -146,6 +146,70 @@
         QTRY_COMPARE(results->rowCount(), 0);
     }
 
+    void testFavoritesReordering()
+    {
+        QStringList favs;
+        favs << "scope://mock-scope-departments" << "scope://mock-scope-double-nav" << "scope://mock-scope";
+        setFavouriteScopes(favs);
+
+        // should have one scope now
+        QTRY_COMPARE(m_scopes->rowCount(), 3);
+        QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(0))->id(), QString("mock-scope-departments"));
+        QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(1))->id(), QString("mock-scope-double-nav"));
+        QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(2))->id(), QString("mock-scope"));
+
+        {
+            QSignalSpy spy(m_scopes.data(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
+            m_scopes->moveFavoriteTo("mock-scope", 1);
+
+            // check new positions
+            QTRY_COMPARE(spy.count(), 1);
+
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(0))->id(), QString("mock-scope-departments"));
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(1))->id(), QString("mock-scope"));
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(2))->id(), QString("mock-scope-double-nav"));
+
+            // check overview model
+            auto categories = m_overviewScope->categories();
+            QVERIFY(categories->rowCount() > 0);
+            QCOMPARE(categories->data(categories->index(0), Categories::Roles::RoleCategoryId), QVariant(QString("favorites")));
+
+            QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
+            QVERIFY(results_var.canConvert<OverviewResultsModel*>());
+            OverviewResultsModel* results = results_var.value<OverviewResultsModel*>();
+            QTRY_COMPARE(results->rowCount(), 3);
+
+            QTRY_COMPARE(results->data(results->index(0), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope-departments")));
+            QTRY_COMPARE(results->data(results->index(1), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope")));
+            QTRY_COMPARE(results->data(results->index(2), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope-double-nav")));
+        }
+        {
+            QSignalSpy spy(m_scopes.data(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
+            m_scopes->moveFavoriteTo("mock-scope", 2);
+
+            // check new positions
+            QTRY_COMPARE(spy.count(), 1);
+
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(0))->id(), QString("mock-scope-departments"));
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(1))->id(), QString("mock-scope-double-nav"));
+            QTRY_COMPARE(qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(2))->id(), QString("mock-scope"));
+
+            // check overview model
+            auto categories = m_overviewScope->categories();
+            QVERIFY(categories->rowCount() > 0);
+            QCOMPARE(categories->data(categories->index(0), Categories::Roles::RoleCategoryId), QVariant(QString("favorites")));
+
+            QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
+            QVERIFY(results_var.canConvert<OverviewResultsModel*>());
+            OverviewResultsModel* results = results_var.value<OverviewResultsModel*>();
+            QTRY_COMPARE(results->rowCount(), 3);
+
+            QTRY_COMPARE(results->data(results->index(0), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope-departments")));
+            QTRY_COMPARE(results->data(results->index(1), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope-double-nav")));
+            QTRY_COMPARE(results->data(results->index(2), OverviewResultsModel::RoleScopeId), QVariant(QString("mock-scope")));
+        }
+    }
+
     void testGSettingsUpdates()
     {
         QStringList favs;
@@ -157,7 +221,7 @@
         auto scope1 = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope-departments")));
         QVERIFY(scope1 != nullptr);
 
-        // un-facorite one scope
+        // un-favorite one scope
         scope1->setFavorite(false);
         QTRY_COMPARE(getFavoriteScopes().size(), 1);
         QCOMPARE(getFavoriteScopes().at(0), QString("scope://mock-scope-double-nav"));

=== modified file 'tests/overviewtest.cpp'
--- tests/overviewtest.cpp	2014-08-14 09:45:50 +0000
+++ tests/overviewtest.cpp	2014-12-16 16:01:50 +0000
@@ -108,12 +108,15 @@
         auto categories = m_scope->categories();
         QVERIFY(categories->rowCount() > 0);
         QCOMPARE(categories->data(categories->index(0), Categories::Roles::RoleCategoryId), QVariant(QString("favorites")));
-        QCOMPARE(categories->data(categories->index(1), Categories::Roles::RoleCategoryId), QVariant(QString("all")));
+        QCOMPARE(categories->data(categories->index(1), Categories::Roles::RoleCategoryId), QVariant(QString("other")));
 
         QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
         QVERIFY(results_var.canConvert<OverviewResultsModel*>());
         OverviewResultsModel* results = results_var.value<OverviewResultsModel*>();
-        QVERIFY(results->rowCount() > 0);
+        QVERIFY(results->rowCount() == 2);
+
+        QCOMPARE(results->data(results->index(0), OverviewResultsModel::Roles::RoleTitle), QVariant(QString("mock-departments.DisplayName")));
+        QCOMPARE(results->data(results->index(0), OverviewResultsModel::Roles::RoleSubtitle), QVariant(QString("mock-double-nav.DisplayName, mock.DisplayName")));
     }
 
     void testPreview()