Merge lp:~unity-team/unity-api/departments into lp:unity-api

[Albert Astals Cid]

Add Departments interfaces

* Are there any related MPs required for this MP to build/function as expected?
Not required, but this should land together with
 https://code.launchpad.net/~aacid/unity8/departments/+merge/221072
and
 https://code.launchpad.net/~mhr3/unity-scopes-shell/department-support

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, tests work, also https://code.launchpad.net/~aacid/unity8/departments/+merge/221072 compiles and make tryDashContent works

 * 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?
It's a minor change, not needed

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

[Michal Hruby (mhr3)]

421 + { tag: "Department[ScopesInterface]", type: "unity::shell::scopes::DepartmentInterface" },

ScopesInterface? Is that right? You also forgot to bzr add MockDepartment.*

[Albert Astals Cid (aacid)]

Fixed

[Albert Astals Cid (aacid)]

Api as agreeded in http://pad.ubuntu.com/dash-departments-shell-api

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity-api-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/181/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

+1

review: Approve

[Michael Zanetti (mzanetti)]

61 + Q_PROPERTY(QString departmentId READ departmentId NOTIFY departmentIdChanged)
76 + Q_PROPERTY(QString parentId READ parentId NOTIFY parentIdChanged)

Just a general comment (feel free to ignore if you don't agree): A consistent API would probably go for "id" and "parentId" or "departmentId" and "parentDepartmentId".

====

91 + Q_PROPERTY(bool isRoot READ isRoot NOTIFY isRootChanged)

isn't this redundant with an empty parentId?

=====

173 + Q_PROPERTY(QString currentDepartment READ currentDepartment NOTIFY currentDepartmentChanged)

Does this refer to the departmentId or the department label?

====

Wouldn't it make sense to have isActive and hasChildren also as Department properties instead only in the model roles?

review: Needs Information

[Albert Astals Cid (aacid)]

> 61 + Q_PROPERTY(QString departmentId READ departmentId NOTIFY
> departmentIdChanged)
> 76 + Q_PROPERTY(QString parentId READ parentId NOTIFY parentIdChanged)
>
> Just a general comment (feel free to ignore if you don't agree): A consistent
> API would probably go for "id" and "parentId" or "departmentId" and
> "parentDepartmentId".

yeah, maybe parentDepartmentId?

>
>
> ====
>
> 91 + Q_PROPERTY(bool isRoot READ isRoot NOTIFY isRootChanged)
>
> isn't this redundant with an empty parentId?

No, empty departmentId is a valid departmentId (sadly)

>
>
> =====
>
> 173 + Q_PROPERTY(QString currentDepartment READ currentDepartment NOTIFY
> currentDepartmentChanged)
>
> Does this refer to the departmentId or the department label?

departmentId, maybe rename to currentDepartmentId to make it more obvious?

>
>
> ====
>
> Wouldn't it make sense to have isActive and hasChildren also as Department
> properties instead only in the model roles?

We don't have a use case for them so i'd prefer to keep the API smaller.

[Michal Hruby (mhr3)]

> Just a general comment (feel free to ignore if you don't agree): A consistent
> API would probably go for "id" and "parentId" or "departmentId" and
> "parentDepartmentId".

We'd like id + parentId too, but QML doesn't like if objects have their own .id property.

[lp:~unity-team/unity-api/departments]

144. By Albert Astals Cid on 2014-05-29

Changes due to review

[Albert Astals Cid (aacid)]

Changes made with the aggreement of Michal

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/unity-api-ci/182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/182/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

For the part Michal did, approve

review: Approve

[lp:~unity-team/unity-api/departments]

145. By Albert Astals Cid on 2014-05-29

Add the two new methods to the test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/unity-api-ci/183/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/183/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

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

N/A

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

Yes

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-28 10:38:05 +0000
+++ debian/changelog	2014-05-29 12:26:08 +0000
@@ -1,3 +1,9 @@
+unity-api (7.82) UNRELEASED; urgency=medium
+
+  * Add interfaces for scope departments.
+
+ -- Albert Astals Cid <[e-mail]>  Thu, 15 May 2014 17:20:44 +0200
+
 unity-api (7.81+14.10.20140528-0ubuntu1) utopic; urgency=low
 
   [ Michael Zanetti ]

=== added file 'include/unity/shell/scopes/DepartmentInterface.h'
--- include/unity/shell/scopes/DepartmentInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/DepartmentInterface.h	2014-05-29 12:26:08 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_DEPARTMENTINTERFACE_H
+#define UNITY_SHELL_SCOPES_DEPARTMENTINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include <QAbstractListModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+/**
+ * @brief Object representing department instance, which exposes model(s) with results.
+ */
+class UNITY_API DepartmentInterface : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+    /**
+     * @brief Id of the department.
+     */
+    Q_PROPERTY(QString departmentId READ departmentId NOTIFY departmentIdChanged)
+
+    /**
+     * @brief Label of the department.
+     */
+    Q_PROPERTY(QString label READ label NOTIFY labelChanged)
+
+    /**
+     * @brief Label for "All Button" of the department.
+     */
+    Q_PROPERTY(QString allLabel READ allLabel NOTIFY allLabelChanged)
+
+    /**
+     * @brief Parent Id of the department.
+     */
+    Q_PROPERTY(QString parentDepartmentId READ parentDepartmentId NOTIFY parentDepartmentIdChanged)
+
+    /**
+     * @brief Parent label of the department.
+     */
+    Q_PROPERTY(QString parentLabel READ parentLabel NOTIFY parentLabelChanged)
+
+    /**
+     * @brief Is the model of the deparment completely loaded?
+     */
+    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
+
+    /**
+     * @brief Is this deparment the root deparment?
+     */
+    Q_PROPERTY(bool isRoot READ isRoot NOTIFY isRootChanged)
+
+    /**
+     * @brief Number of items of the deparment.
+     */
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+protected:
+    /// @cond
+    explicit DepartmentInterface(QObject* parent = 0) : QAbstractListModel(parent) { }
+    /// @endcond
+
+public:
+    /**
+     * @brief The roles supported by this model.
+     */
+    enum Roles {
+        RoleDepartmentId,
+        RoleLabel,
+        RoleHasChildren,
+        RoleIsActive
+    };
+
+    // @cond
+    virtual QString departmentId() const = 0;
+    virtual QString label() const = 0;
+    virtual QString allLabel() const = 0;
+    virtual QString parentDepartmentId() const = 0;
+    virtual QString parentLabel() const = 0;
+    virtual bool loaded() const = 0;
+    virtual bool isRoot() const = 0;
+    virtual int count() const = 0;
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleDepartmentId] = "departmentId";
+        roles[RoleLabel] = "label";
+        roles[RoleHasChildren] = "hasChildren";
+        roles[RoleIsActive] = "isActive";
+        return roles;
+    }
+    // @endcond
+
+Q_SIGNALS:
+    // @cond
+    void departmentIdChanged();
+    void labelChanged();
+    void allLabelChanged();
+    void parentDepartmentIdChanged();
+    void parentLabelChanged();
+    void loadedChanged();
+    void isRootChanged();
+    void countChanged();
+    // @endcond
+};
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::DepartmentInterface*)
+
+#endif

=== modified file 'include/unity/shell/scopes/ScopeInterface.h'
--- include/unity/shell/scopes/ScopeInterface.h	2014-05-19 11:45:31 +0000
+++ include/unity/shell/scopes/ScopeInterface.h	2014-05-29 12:26:08 +0000
@@ -30,6 +30,7 @@
 
 class CategoriesInterface;
 class PreviewStackInterface;
+class DepartmentInterface;
 
 /**
  * @brief Object representing scope instance, which exposes model(s) with results.
@@ -109,6 +110,16 @@
      */
     Q_PROPERTY(bool isActive READ isActive WRITE setActive NOTIFY isActiveChanged)
 
+    /**
+     * @brief String specifying currently selected department
+     */
+    Q_PROPERTY(QString currentDepartmentId READ currentDepartmentId NOTIFY currentDepartmentIdChanged)
+
+    /**
+     * @brief Boolean specifying whether current query has departments.
+     */
+    Q_PROPERTY(bool hasDepartments READ hasDepartments NOTIFY hasDepartmentsChanged)
+
 protected:
     /// @cond
     explicit ScopeInterface(QObject* parent = 0) : QObject(parent) { }
@@ -130,6 +141,8 @@
     virtual QString noResultsHint() const = 0;
     virtual QString formFactor() const = 0;
     virtual bool isActive() const = 0;
+    virtual QString currentDepartmentId() const = 0;
+    virtual bool hasDepartments() const = 0;
 
     /* setters */
     virtual void setSearchQuery(const QString& search_query) = 0;
@@ -161,21 +174,35 @@
      */
     Q_INVOKABLE virtual void closeScope(unity::shell::scopes::ScopeInterface* scope) = 0;
 
+    /**
+     * @brief Get a DepartmentInterface instance for the passed departmentId.
+     */
+    Q_INVOKABLE virtual unity::shell::scopes::DepartmentInterface* getDepartment(QString const& departmentId) = 0;
+
+    /**
+     * @brief Activate department by its id.
+     *
+     * This effectively runs a new query.
+     */
+    Q_INVOKABLE virtual void loadDepartment(QString const& departmentId) = 0;
+
 Q_SIGNALS:
     // @cond
     void idChanged();
-    void nameChanged(const QString&);
-    void iconHintChanged(const QString&);
-    void descriptionChanged(const QString&);
-    void searchHintChanged(const QString&);
+    void nameChanged();
+    void iconHintChanged();
+    void descriptionChanged();
+    void searchHintChanged();
     void searchInProgressChanged();
-    void visibleChanged(bool);
-    void shortcutChanged(const QString&);
+    void visibleChanged();
+    void shortcutChanged();
     void categoriesChanged();
     void searchQueryChanged();
     void noResultsHintChanged();
     void formFactorChanged();
-    void isActiveChanged(bool);
+    void isActiveChanged();
+    void hasDepartmentsChanged();
+    void currentDepartmentIdChanged();
     // @endcond
 
     // signals triggered by activate(..) or preview(..) requests.

=== modified file 'include/unity/shell/scopes/ScopesInterface.h'
--- include/unity/shell/scopes/ScopesInterface.h	2014-05-19 11:45:10 +0000
+++ include/unity/shell/scopes/ScopesInterface.h	2014-05-29 12:26:08 +0000
@@ -93,7 +93,7 @@
 
 Q_SIGNALS:
     // @cond
-    void loadedChanged(bool loaded);
+    void loadedChanged();
     // @endcond
 };
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt'
--- test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2014-05-13 13:52:12 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2014-05-29 12:26:08 +0000
@@ -12,6 +12,7 @@
 
 set(ScopesMocks_SOURCES
     Mocks/MockCategories.cpp
+    Mocks/MockDepartment.cpp
     Mocks/MockResultsModel.cpp
     Mocks/MockPreviewModel.cpp
     Mocks/MockPreviewStack.cpp
@@ -19,6 +20,7 @@
     Mocks/MockScope.cpp
     Mocks/MockScopes.cpp
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/CategoriesInterface.h
+    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/DepartmentInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/ResultsModelInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/PreviewModelInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/PreviewWidgetModelInterface.h

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp	2014-05-29 12:26:08 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// self
+#include "MockDepartment.h"
+
+MockDepartment::MockDepartment(QObject* parent)
+ : unity::shell::scopes::DepartmentInterface(parent)
+{
+}
+
+QString MockDepartment::departmentId() const
+{
+    return "root";
+}
+
+QString MockDepartment::label() const
+{
+    return "All Departments";
+}
+
+QString MockDepartment::allLabel() const
+{
+    return "All Departments";
+}
+
+QString MockDepartment::parentDepartmentId() const
+{
+    return QString();
+}
+
+QString MockDepartment::parentLabel() const
+{
+    return QString();
+}
+
+bool MockDepartment::loaded() const
+{
+    return true;
+}
+
+bool MockDepartment::isRoot() const
+{
+    return true;
+}
+
+int MockDepartment::count() const
+{
+    return rowCount();
+}
+
+int MockDepartment::rowCount(const QModelIndex&) const
+{
+    return 1;
+}
+
+QVariant MockDepartment::data(const QModelIndex& /*index*/, int role) const
+{
+    switch (role) {
+        case RoleDepartmentId:
+            return "child";
+        case RoleLabel:
+            return "Child Clothes";
+        case RoleHasChildren:
+            return true;
+        case RoleIsActive:
+            return false;
+        default:
+            return QVariant();
+    }
+}

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.h	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.h	2014-05-29 12:26:08 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef MOCKDEPARTMENT_H
+#define MOCKDEPARTMENT_H
+
+#include <unity/shell/scopes/DepartmentInterface.h>
+
+#include <QSharedPointer>
+
+class MockDepartment : public unity::shell::scopes::DepartmentInterface
+{
+    Q_OBJECT
+
+public:
+    explicit MockDepartment(QObject* parent = 0);
+
+    QString departmentId() const override;
+    QString label() const override;
+    QString allLabel() const override;
+    QString parentDepartmentId() const override;
+    QString parentLabel() const override;
+    bool loaded() const override;
+    bool isRoot() const override;
+    int count() const override;
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+};
+
+#endif // MOCKDEPARTMENT_H

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2014-05-14 08:19:03 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2014-05-29 12:26:08 +0000
@@ -17,6 +17,7 @@
 #include "MockScope.h"
 #include "MockCategories.h"
 #include "MockPreviewStack.h"
+#include "MockDepartment.h"
 
 MockScope::MockScope(QObject* parent) : MockScope(QString(), QString(), false, parent)
 {
@@ -62,6 +63,10 @@
     return QString("");
 }
 
+QString MockScope::currentDepartmentId() const {
+    return m_currentDepartmentId;
+}
+
 bool MockScope::searchInProgress() const {
     return m_searching;
 }
@@ -86,10 +91,14 @@
     return m_isActive;
 }
 
+bool MockScope::hasDepartments() const {
+    return m_hasDepartments;
+}
+
 void MockScope::setName(const QString &str) {
     if (str != m_name) {
         m_name = str;
-        Q_EMIT nameChanged(m_name);
+        Q_EMIT nameChanged();
     }
 }
 
@@ -110,7 +119,7 @@
 void MockScope::setActive(const bool active) {
     if (active != m_isActive) {
         m_isActive = active;
-        Q_EMIT isActiveChanged(active);
+        Q_EMIT isActiveChanged();
     }
 }
 
@@ -135,6 +144,18 @@
     return new MockPreviewStack;
 }
 
+unity::shell::scopes::DepartmentInterface* MockScope::getDepartment(QString const& departmentId)
+{
+    Q_UNUSED(departmentId);
+
+    return new MockDepartment();
+}
+
+void MockScope::loadDepartment(QString const& departmentId)
+{
+    Q_UNUSED(departmentId);
+}
+
 void MockScope::cancelActivation()
 {
 }

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2014-05-13 13:52:12 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2014-05-29 12:26:08 +0000
@@ -41,6 +41,8 @@
     QString noResultsHint() const override;
     QString formFactor() const override;
     bool isActive() const override;
+    bool hasDepartments() const override;
+    QString currentDepartmentId() const override;
 
     /* setters */
     void setName(const QString& name);
@@ -53,6 +55,8 @@
     Q_INVOKABLE unity::shell::scopes::PreviewStackInterface* preview(QVariant const& result) override;
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
+    Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(QString const& departmentId) override;
+    Q_INVOKABLE void loadDepartment(QString const& departmentId) override;
 
 protected:
     QString m_id;
@@ -62,9 +66,11 @@
     QString m_searchQuery;
     QString m_noResultsHint;
     QString m_formFactor;
+    QString m_currentDepartmentId;
     bool m_visible;
     bool m_searching;
     bool m_isActive;
+    bool m_hasDepartments;
 
     QString m_previewRendererName;
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2014-05-19 11:45:10 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2014-05-29 12:26:08 +0000
@@ -20,6 +20,7 @@
 #include <QtQml/qqml.h>
 
 #include "CategoriesInterface.h"
+#include "DepartmentInterface.h"
 #include "ResultsModelInterface.h"
 #include "PreviewModelInterface.h"
 #include "PreviewWidgetModelInterface.h"
@@ -32,6 +33,7 @@
     qmlRegisterType<MockScopes>(uri, 0, 2, "Scopes");
     qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Categories object in QML. Get them from Scopes instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::ResultsModelInterface>(uri, 0, 2, "ResultsModel", "Can't create new ResultsModel in QML. Get them from Categories instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewWidgetModelInterface>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");

=== modified file 'test/qmltest/unity/shell/scopes/tst_Scopes.qml'
--- test/qmltest/unity/shell/scopes/tst_Scopes.qml	2014-05-19 11:45:10 +0000
+++ test/qmltest/unity/shell/scopes/tst_Scopes.qml	2014-05-29 12:26:08 +0000
@@ -28,6 +28,7 @@
     }
     property var scope: scopes.getScope(0)
     property var preview: root.scope.preview("")
+    property var department: root.scope.getDepartment("root")
 
     Verifier {
         id: scopesVerifier
@@ -123,7 +124,9 @@
                 { tag: "Item.properties[searchQuery]", constant: "searchQuery", type: "string" },
                 { tag: "Item.properties[noResultsHint]", constant: "noResultsHint", type: "string" },
                 { tag: "Item.properties[formFactor]", constant: "formFactor", type: "string" },
-                { tag: "Item.properties[isActive]", constant: "isActive", type: "boolean" }
+                { tag: "Item.properties[isActive]", constant: "isActive", type: "boolean" },
+                { tag: "Item.properties[currentDepartmentId]", constant: "currentDepartmentId", type: "string" },
+                { tag: "Item.properties[hasDepartments]", constant: "hasDepartments", type: "boolean" }
             ];
         }
 
@@ -145,7 +148,9 @@
                 { tag: "Model.methods[previewRequested]", method: "previewRequested" },
                 { tag: "Model.methods[gotoScope]", method: "gotoScope" },
                 { tag: "Model.methods[openScope]", method: "openScope" },
-                { tag: "Model.methods[activateApplication]", method: "activateApplication" }
+                { tag: "Model.methods[activateApplication]", method: "activateApplication" },
+                { tag: "Model.methods[getDepartment]", method: "getDepartment" },
+                { tag: "Model.methods[loadDepartment]", method: "loadDepartment" }
             ];
         }
 
@@ -438,4 +443,64 @@
             verifyData(data);
         }
     }
+
+
+    Verifier {
+        id: departmentVerifier
+
+        Repeater {
+             id: departmentRepeater
+             model: root.department
+             delegate: Item {
+                 property var roles: model
+             }
+        }
+
+        function test_department_data() {
+            return [
+                { tag: "Department[object]", type: "object" },
+                { tag: "Department[DepartmentInterface]", type: "unity::shell::scopes::DepartmentInterface" },
+            ];
+        }
+
+        function test_department(data) {
+            object = departmentRepeater.model;
+            name = "Department";
+            verifyData(data);
+        }
+
+        function test_department_roles_data() {
+            return [
+                { tag: "Model.roles[departmentId]", role: "departmentId", type: "string" },
+                { tag: "Model.roles[label]", role: "label", type: "string" },
+                { tag: "Model.roles[hasChildren]", role: "hasChildren", type: "boolean" },
+                { tag: "Model.roles[isActive]", role: "isActive", type: "boolean" }
+            ];
+        }
+
+        function test_department_roles(data) {
+            object = departmentRepeater.itemAt(0).roles;
+            name = "Department";
+            verifyData(data);
+        }
+
+        function test_department_properties_data() {
+            return [
+                { tag: "Model.properties[departmentId]", constant: "departmentId", type: "string" },
+                { tag: "Model.properties[label]", constant: "label", type: "string" },
+                { tag: "Model.properties[allLabel]", constant: "allLabel", type: "string" },
+                { tag: "Model.properties[parentDepartmentId]", constant: "parentDepartmentId", type: "string" },
+                { tag: "Model.properties[parentLabel]", constant: "parentLabel", type: "string" },
+                { tag: "Model.properties[loaded]", constant: "loaded", type: "boolean" },
+                { tag: "Model.properties[isRoot]", constant: "isRoot", type: "boolean" },
+                { tag: "Model.properties[count]", constant: "count", type: "number" }
+            ];
+        }
+
+        function test_department_properties(data) {
+            object = departmentRepeater.model;
+            name = "Department";
+            verifyData(data);
+        }
+    }
 }