Merge lp:~fboucault/webbrowser-app/downloads_emblem into lp:webbrowser-app/staging

[Florian Boucault]

Download UX: when initiating a download do not take the user to the downloads page but display a download emblem instead.

[Olivier Tilloy (osomon)]

If I initiate a download, I get the animated blue emblem. If I then open the downloads page before the download has completed and keep it open until after the download has completed, I would expect that when closing it, the download emblem is gone, because I obviously know that the download is complete. But it’s still there (turned to green).

review: Needs Fixing

[Olivier Tilloy (osomon)]

If I initiate a long-running download (try the daily-live ubuntu ISO image), then open the downloads page before the download has completed, and cancel the download, after closing the page I’m seeing a green emblem. That’s probably related to the issue I pointed out above, but it’s slightly worse because a cancelled download shouldn’t be advertised as finished, I think.

[Olivier Tilloy (osomon)]

One really cool thing is that if I initiate a long-running download and then close the browser, when I open it again the animated emblem is still there to remind me that I have an ongoing download.

[Olivier Tilloy (osomon)]

If I initiate a download in a browser window, I get the animated blue emblem. If I then open another browser window before the download has completed, the other window also has the emblem. When the download completes, the animation finishes and the emblem turns green in both windows.
However if I open the downloads page in one of the windows and then close it, the emblem goes away in that window, but not in the other one. I would expect it to go away in all windows.

review: Needs Fixing

[Florian Boucault (fboucault)]

All 3 issues were fixed.

[Olivier Tilloy (osomon)]

Overall, LGTM. I have a few minor comments, please see inline.

[lp:~fboucault/webbrowser-app/downloads_emblem]

1652. By Florian Boucault on 2017-03-30

Cleanup

Unmerged revisions

1652. By Florian Boucault on 2017-03-30

Cleanup

1651. By Florian Boucault on 2017-03-30

Added download count emblem related tests

1650. By Florian Boucault on 2017-03-30

Merged lp:~fboucault/webbrowser-app/qmltests

1649. By Florian Boucault on 2017-03-30

Merged lp:~osomon/webbrowser-app/qmltests

1648. By Florian Boucault on 2017-03-29

Merged lp:~osomon/webbrowser-app/qmltests

1647. By Florian Boucault on 2017-03-29

Merged staging

1646. By Florian Boucault on 2017-03-29

Readonly properties when it makes sense

1645. By Florian Boucault on 2017-03-29

Fixed typo: added 'n' to 'dowloads'

1644. By Florian Boucault on 2017-03-28

Synchronise finished downloads accross windows.
Discard finished downloads if the downloads view is opened.

1643. By Florian Boucault on 2017-03-28

Merged from staging

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2016-10-31 10:53:51 +0000
+++ src/app/browserapplication.cpp	2017-03-30 13:48:57 +0000
@@ -183,6 +183,7 @@
     if (!isRunningInstalled()) {
         m_engine->addImportPath(UbuntuBrowserImportsDirectory());
     }
+    m_engine->setBaseUrl(QUrl::fromLocalFile(UbuntuBrowserDirectory()));
     qmlEngineCreated(m_engine);
 
     QQmlContext* context = m_engine->rootContext();
@@ -190,7 +191,7 @@
     context->setContextProperty("unversionedAppId", unversionedAppId);
 
     m_component = new QQmlComponent(m_engine);
-    m_component->loadUrl(QUrl::fromLocalFile(UbuntuBrowserDirectory() + "/" + qmlFileSubPath));
+    m_component->loadUrl(qmlFileSubPath);
     if (!m_component->isReady()) {
         qWarning() << m_component->errorString();
         return false;

=== modified file 'src/app/config.h.in'
--- src/app/config.h.in	2016-07-12 11:54:37 +0000
+++ src/app/config.h.in	2017-03-30 13:48:57 +0000
@@ -35,9 +35,9 @@
 inline QString UbuntuBrowserDirectory()
 {
     if (isRunningInstalled()) {
-        return qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
+        return qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app/");
     } else {
-        return QStringLiteral("@CMAKE_SOURCE_DIR@/src/app");
+        return QStringLiteral("@CMAKE_SOURCE_DIR@/src/app/");
     }
 }
 

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2017-03-30 13:48:56 +0000
+++ src/app/webbrowser/Browser.qml	2017-03-30 13:48:57 +0000
@@ -40,6 +40,8 @@
     currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null
 
     property bool incognito: false
+    property bool downloadsViewOpened: downloadsViewLoader.status == Loader.Ready
+    property bool discardFinishedDownloads: false
 
     property var tabsModel: TabsModel {
         // These methods are required by the TabsBar component
@@ -523,6 +525,7 @@
         objectName: "chrome"
 
         tab: internal.nextTab || tabsModel.currentTab
+        downloadManager: downloadHandlerLoader.item
         tabsModel: browser.tabsModel
         searchUrl: currentSearchEngine.urlTemplate
 
@@ -627,6 +630,10 @@
                 iconName: "save"
                 enabled: downloadHandlerLoader.status == Loader.Ready && contentHandlerLoader.status == Loader.Ready
                 onTriggered: downloadsViewLoader.active = true
+                property var downloadsInProgress: downloadHandlerLoader.item ? downloadHandlerLoader.item.downloadsInProgress : []
+                property var downloadsFinished: downloadHandlerLoader.item ? downloadHandlerLoader.item.downloadsFinished : []
+                property int count: downloadsInProgress.length + downloadsFinished.length
+                property bool pulsating: downloadsInProgress.length > 0
             },
             Action {
                 objectName: "settings"
@@ -991,8 +998,10 @@
 
     Loader {
         id: downloadHandlerLoader
-        source: "DownloadHandler.qml"
         asynchronous: true
+        Component.onCompleted: setSource("DownloadHandler.qml",
+                                         {"incognito": Qt.binding(function () {return browser.incognito}),
+                                          "discardFinishedDownloads": Qt.binding(function () {return browser.discardFinishedDownloads})})
     }
 
     property Component tabComponent

=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2017-02-14 10:12:50 +0000
+++ src/app/webbrowser/Chrome.qml	2017-03-30 13:48:57 +0000
@@ -25,6 +25,7 @@
 
     property var tabsModel
     property alias tab: navigationBar.tab
+    property alias downloadManager: navigationBar.downloadManager
     readonly property var webview: tab ? tab.webview : null
     property alias searchUrl: navigationBar.searchUrl
     property alias text: navigationBar.text

=== added file 'src/app/webbrowser/CountEmblem.qml'
--- src/app/webbrowser/CountEmblem.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/CountEmblem.qml	2017-03-30 13:48:57 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: countEmblem
+
+    property int count: 0
+    property bool pulsating: false
+    readonly property real maxWidth: parent.width
+
+    implicitWidth: Math.min(maxWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
+    implicitHeight: units.gu(2)
+    visible: countEmblem.count > 0
+
+    UbuntuShape {
+        anchors.fill: parent
+        anchors.margins: -units.dp(1)
+        backgroundColor: Qt.darker(backgroundShape.backgroundColor, 1.3)
+        aspect: UbuntuShape.Flat
+
+        opacity: 0
+        SequentialAnimation on opacity {
+            running: countEmblem.pulsating
+            alwaysRunToEnd: true
+            loops: Animation.Infinite
+            NumberAnimation { to: 1; duration: UbuntuAnimation.SlowDuration; easing: UbuntuAnimation.StandardEasingReverse }
+            NumberAnimation { to: 0; duration: UbuntuAnimation.SlowDuration; easing: UbuntuAnimation.StandardEasing }
+        }
+    }
+
+    UbuntuShape {
+        id: backgroundShape
+        anchors.fill: parent
+        backgroundColor: pulsating ? theme.palette.normal.activity : theme.palette.normal.positive
+        aspect: UbuntuShape.Flat
+    }
+
+    Label {
+        id: countLabel
+        text: countEmblem.count
+        anchors.centerIn: parent
+        width: countEmblem.maxWidth - units.gu(1)
+        horizontalAlignment: Text.AlignHCenter
+        elide: Text.ElideRight
+        color: pulsating ? theme.palette.normal.activityText : theme.palette.normal.positiveText
+        textSize: Label.Small
+    }
+}

=== modified file 'src/app/webbrowser/DownloadHandler.qml'
--- src/app/webbrowser/DownloadHandler.qml	2016-01-12 11:06:49 +0000
+++ src/app/webbrowser/DownloadHandler.qml	2017-03-30 13:48:57 +0000
@@ -21,6 +21,67 @@
 import webbrowserapp.private 0.1
 
 DownloadManager {
+    id: downloadManager
+
+    property var downloadsInProgress: []
+    property var downloadsFinished: []
+    property bool incognito: false
+    property bool discardFinishedDownloads: false
+    onDiscardFinishedDownloadsChanged: if (discardFinishedDownloads) downloadsFinished = []
+
+    function exists(downloadId) {
+        for(var i = 0; i < downloadManager.downloads.length; i++) {
+            var download = downloadManager.downloads[i];
+            if (download.downloadId == downloadId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function listDownloadsInProgress() {
+        var downloads = [];
+        for(var i = 0; i < DownloadsModel.count; i++) {
+            var download = DownloadsModel.get(i);
+            // There can be downloads in DownloadsModel which are not 'complete'
+            // but not in progress any more (typical reason is because they failed).
+            // In order to filter them out, we check that they do not exist in
+            // in the DownloadManager.
+            if (!downloadManager.exists(download.downloadId)) {
+                continue;
+            }
+
+            if (!download.complete &&
+                (download.incognito == downloadManager.incognito)) {
+                downloads.push(download.downloadId);
+            }
+        }
+        return downloads;
+    }
+
+    function listDifference(list, minusList) {
+        return list.filter(function(i) {return minusList.indexOf(i) == -1;});
+    }
+
+    function updateDownloads() {
+        var downloadsInProgressBefore = downloadsInProgress;
+        downloadsInProgress = listDownloadsInProgress();
+        if (!discardFinishedDownloads) {
+            var newDownloadsFinished = listDifference(downloadsInProgressBefore, downloadsInProgress);
+            downloadsFinished = downloadsFinished.concat(newDownloadsFinished);
+        }
+    }
+
+    onDownloadsChanged: updateDownloads()
+    Component.onCompleted: updateDownloads()
+
+    property var downloadsModelConnections: Connections {
+        target: DownloadsModel
+        onDataChanged: downloadManager.updateDownloads()
+        onRowCountChanged: downloadManager.updateDownloads()
+        onModelReset: downloadManager.updateDownloads()
+    }
+
     onDownloadFinished: {
         if (DownloadsModel.contains(download.downloadId)) {
             DownloadsModel.moveToDownloads(download.downloadId, path)

=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml	2017-02-03 15:11:00 +0000
+++ src/app/webbrowser/NavigationBar.qml	2017-03-30 13:48:57 +0000
@@ -41,6 +41,7 @@
     property color fgColor: Theme.palette.normal.baseText
     property color iconColor: UbuntuColors.darkGrey
     property real availableHeight
+    property var downloadManager
 
     onFindInPageModeChanged: if (findInPageMode) addressbar.text = ""
     onIncognitoChanged: findInPageMode = false
@@ -206,6 +207,19 @@
                         internal.openDrawer.opened = true
                     }
                 }
+
+                CountEmblem {
+                    anchors {
+                        right: parent.right
+                        top: parent.top
+                        topMargin: units.gu(0.5)
+                    }
+                    objectName: "countEmblem"
+                    readonly property var downloadsInProgress: root.downloadManager ? root.downloadManager.downloadsInProgress : []
+                    readonly property var downloadsFinished: root.downloadManager ? root.downloadManager.downloadsFinished : []
+                    count: downloadsInProgress.length + downloadsFinished.length
+                    pulsating: downloadsInProgress.length > 0
+                }
             }
         }
     }
@@ -346,7 +360,7 @@
                             left: actionIcon.right
                             leftMargin: units.gu(2)
                             verticalCenter: parent.verticalCenter
-                            right: parent.right
+                            right: countEmblem.left
                             rightMargin: units.gu(1)
                         }
                         text: model.text
@@ -354,6 +368,19 @@
                         color: root.fgColor
                         elide: Text.ElideRight
                     }
+
+                    CountEmblem {
+                        id: countEmblem
+                        anchors {
+                            top: undefined
+                            verticalCenter: parent.verticalCenter
+                            right: parent.right
+                            rightMargin: units.gu(1)
+                        }
+                        width: visible ? implicitWidth : 0
+                        count: modelData.count !== undefined ? modelData.count : 0
+                        pulsating: modelData.pulsating !== undefined && modelData.pulsating
+                    }
                 }
             }
         }

=== modified file 'src/app/webbrowser/TabComponent.qml'
--- src/app/webbrowser/TabComponent.qml	2017-02-15 11:22:05 +0000
+++ src/app/webbrowser/TabComponent.qml	2017-03-30 13:48:57 +0000
@@ -449,7 +449,6 @@
             function startDownload(downloadId, download, mimeType) {
                 DownloadsModel.add(downloadId, download.url, mimeType, incognito)
                 download.start()
-                downloadsViewLoader.active = true
             }
 
         }

=== modified file 'src/app/webbrowser/downloads-model.cpp'
--- src/app/webbrowser/downloads-model.cpp	2016-09-22 09:11:35 +0000
+++ src/app/webbrowser/downloads-model.cpp	2017-03-30 13:48:57 +0000
@@ -78,6 +78,7 @@
     createOrAlterDatabaseSchema();
     endResetModel();
     Q_EMIT rowCountChanged();
+    fetchMore();
 }
 
 void DownloadsModel::createOrAlterDatabaseSchema()
@@ -451,6 +452,26 @@
     }
 }
 
+QVariantMap DownloadsModel::get(int row)
+{
+    if (row < 0 || row >= rowCount()) {
+        return QVariantMap();
+    }
+
+    QVariantMap res;
+    QHash<int,QByteArray> names = roleNames();
+    QHashIterator<int, QByteArray> i(names);
+
+    while (i.hasNext()) {
+        i.next();
+        QModelIndex idx = index(row, 0);
+        QVariant data = idx.data(i.key());
+        res[i.value()] = data;
+    }
+
+    return res;
+}
+
 void DownloadsModel::removeExistingEntryFromDatabase(const QString& path)
 {
     QSqlQuery query(m_database);

=== modified file 'src/app/webbrowser/downloads-model.h'
--- src/app/webbrowser/downloads-model.h	2016-09-22 09:11:35 +0000
+++ src/app/webbrowser/downloads-model.h	2017-03-30 13:48:57 +0000
@@ -73,6 +73,7 @@
     Q_INVOKABLE void pauseDownload(const QString& downloadId);
     Q_INVOKABLE void resumeDownload(const QString& downloadId);
     Q_INVOKABLE void pruneIncognitoDownloads();
+    Q_INVOKABLE QVariantMap get(int row);
 
 Q_SIGNALS:
     void databasePathChanged() const;

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2017-02-14 10:12:50 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2017-03-30 13:48:57 +0000
@@ -83,7 +83,7 @@
     if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml", QStringLiteral("webbrowser-app"))) {
         QStringList searchEnginesSearchPaths;
         searchEnginesSearchPaths << QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/searchengines";
-        searchEnginesSearchPaths << UbuntuBrowserDirectory() + "/webbrowser/searchengines";
+        searchEnginesSearchPaths << UbuntuBrowserDirectory() + "webbrowser/searchengines";
         m_engine->rootContext()->setContextProperty("searchEnginesSearchPaths", searchEnginesSearchPaths);
 
         m_engine->rootContext()->setContextProperty("__platformName", platformName());

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2017-03-30 13:48:56 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2017-03-30 13:48:57 +0000
@@ -87,6 +87,19 @@
         window.requestActivate()
     }
 
+    function updateDiscardFinishedDownloads() {
+        for (var i = allWindows.length - 1; i >= 0; --i) {
+            var window = allWindows[i]
+            if (window.downloadsViewOpened) {
+                discardFinishedDownloads = true;
+                return;
+            }
+        }
+        discardFinishedDownloads = false;
+    }
+
+    property bool discardFinishedDownloads: false
+
     property var windowFactory: Component {
         BrowserWindow {
             id: window
@@ -95,6 +108,8 @@
             height: (initialWindowSize.height > 0) ? initialWindowSize.height : defaultHeight
 
             property alias incognito: browser.incognito
+            property alias downloadsViewOpened: browser.downloadsViewOpened
+            onDownloadsViewOpenedChanged: webbrowserapp.updateDiscardFinishedDownloads()
             readonly property alias model: browser.tabsModel
             readonly property var tabsModel: browser.tabsModel
             readonly property bool wide: browser.wide
@@ -191,6 +206,7 @@
                 thisWindow: window
                 settings: webbrowserapp.settings
                 windowFactory: webbrowserapp.windowFactory
+                discardFinishedDownloads: webbrowserapp.discardFinishedDownloads
                 onNewWindowRequested: {
                     var window = windowFactory.createObject(
                         null,

=== modified file 'tests/qmltests/webbrowser-app/SingleWindowTestCase.qml'
--- tests/qmltests/webbrowser-app/SingleWindowTestCase.qml	2017-03-30 13:48:56 +0000
+++ tests/qmltests/webbrowser-app/SingleWindowTestCase.qml	2017-03-30 13:48:57 +0000
@@ -88,10 +88,10 @@
     }
 
     function open_drawer(action) {
-        var chrome = findChild(window.contentItem, "chrome");
-        var drawerButton = findChild(chrome, "drawerButton");
+        var chrome = waitForChild(window.contentItem, "chrome");
+        var drawerButton = waitForChild(chrome, "drawerButton");
         clickItem(drawerButton);
-        var drawer = findChild(chrome, "drawer");
+        var drawer = waitForChild(chrome, "drawer");
         tryCompare(drawer, "clip", false);
         if (action) {
             clickItem(findChild(drawer, action));

=== modified file 'tests/qmltests/webbrowser-app/WebbrowserAppTestCase.qml'
--- tests/qmltests/webbrowser-app/WebbrowserAppTestCase.qml	2017-03-30 13:48:56 +0000
+++ tests/qmltests/webbrowser-app/WebbrowserAppTestCase.qml	2017-03-30 13:48:57 +0000
@@ -44,7 +44,7 @@
     Loader {
         id: loader
         active: false
-        source: "../../../src/app/webbrowser/webbrowser-app.qml"
+        source: Qt.resolvedUrl("../../../src/app/webbrowser/webbrowser-app.qml")
     }
 
     SignalSpy {

=== modified file 'tests/qmltests/webbrowser-app/tst_Downloads.qml'
--- tests/qmltests/webbrowser-app/tst_Downloads.qml	2017-03-30 13:48:56 +0000
+++ tests/qmltests/webbrowser-app/tst_Downloads.qml	2017-03-30 13:48:57 +0000
@@ -28,18 +28,34 @@
     property var optionsDialog: null
 
     function open_downloads() {
+        waitForRendering(window.contentItem);
         open_drawer("downloads");
         downloadsPage = waitForChild(window.contentItem, "downloadsPage");
         verify(downloadsPage != null);
         waitForRendering(downloadsPage);
     }
 
-    function test_open_close_downloads_page() {
-        open_downloads();
+    function close_downloads() {
         var pageHeader = findChild(downloadsPage, "pageHeader");
         var backButton = waitForChild(pageHeader, "back_button");
         tryCompare(backButton, "visible", true);
         clickItem(backButton);
+    }
+
+    function start_download(path) {
+        browse_to(path, false);
+        optionsDialog =
+            waitForChild(window.contentItem, "downloadOptionsDialog");
+        tryCompare(optionsDialog, "visible", true);
+        var button = findChild(optionsDialog, "downloadFileButton");
+        clickItem(button);
+        waitForRendering(window.contentItem);
+    }
+
+    function test_open_close_downloads_page() {
+        open_downloads();
+        verify(downloadsPage != null);
+        close_downloads();
         tryCompare(this, "downloadsPage", null);
     }
 
@@ -91,15 +107,85 @@
     }
 
     function test_download() {
-        browse_to("test.pdf", false);
-        optionsDialog =
-            waitForChild(window.contentItem, "downloadOptionsDialog");
-        tryCompare(optionsDialog, "visible", true);
-        var button = findChild(optionsDialog, "downloadFileButton");
-        clickItem(button);
-        downloadsPage = waitForChild(window.contentItem, "downloadsPage");
-        verify(downloadsPage != null);
-        tryCompare(downloadsPage, "visible", true);
+        start_download("test.pdf");
+        var countEmblem = waitForChild(window.contentItem, "countEmblem");
+        verify(countEmblem != null);
+        tryCompare(countEmblem, "count", 1);
+        tryCompare(countEmblem, "visible", true);
+        open_downloads();
+        close_downloads();
+        tryCompare(countEmblem, "visible", false);
+    }
+
+    function test_multiple_downloads() {
+        var countEmblem = waitForChild(window.contentItem, "countEmblem");
+        verify(countEmblem != null);
+        tryCompare(countEmblem, "count", 0);
+        tryCompare(countEmblem, "visible", false);
+
+        // first download
+        start_download("test.pdf");
+        tryCompare(countEmblem, "count", 1);
+        tryCompare(countEmblem, "visible", true);
+
+        // second download
+        start_download("test.pdf");
+        tryCompare(countEmblem, "count", 2);
+        tryCompare(countEmblem, "visible", true);
+
+        // third download
+        start_download("test.pdf");
+        tryCompare(countEmblem, "count", 3);
+        tryCompare(countEmblem, "visible", true);
+
+        open_downloads();
+        close_downloads();
+        tryCompare(countEmblem, "count", 0);
+        tryCompare(countEmblem, "visible", false);
+    }
+
+    function test_download_multiple_windows() {
+        var firstWindow = app.allWindows[0];
+        open_drawer("newwindow");
+        tryCompare(app.allWindows, "length", 2);
+        var secondWindow = app.allWindows[1];
+
+        var firstCountEmblem = waitForChild(firstWindow.contentItem, "countEmblem");
+        verify(firstCountEmblem != null);
+        tryCompare(firstCountEmblem, "count", 0);
+        tryCompare(firstCountEmblem, "visible", false);
+
+        var secondCountEmblem = waitForChild(secondWindow.contentItem, "countEmblem");
+        verify(secondCountEmblem != null);
+        tryCompare(secondCountEmblem, "count", 0);
+        tryCompare(secondCountEmblem, "visible", false);
+
+        tryCompare(secondWindow, "active", true);
+        window = secondWindow;
+        start_download("test.pdf");
+
+        tryCompare(firstCountEmblem, "count", 1);
+        tryCompare(firstCountEmblem, "visible", true);
+
+        tryCompare(secondCountEmblem, "count", 1);
+        tryCompare(secondCountEmblem, "visible", true);
+
+        // Open downloads page in first window, and check that the emblem
+        // is gone in both windows
+        firstWindow.requestActivate();
+        tryCompare(firstWindow, "active", true);
+        window = firstWindow;
+
+        open_downloads();
+        close_downloads();
+
+        tryCompare(firstCountEmblem, "count", 0);
+        tryCompare(firstCountEmblem, "visible", false);
+        tryCompare(secondCountEmblem, "count", 0);
+        tryCompare(secondCountEmblem, "visible", false);
+
+        // Clean up
+        secondWindow.close();
     }
 
     function test_private_download() {
@@ -111,6 +197,16 @@
         verify(privateWindow.incognito);
         tryCompare(privateWindow, "active", true);
 
+        var publicCountEmblem = waitForChild(publicWindow.contentItem, "countEmblem");
+        verify(publicCountEmblem != null);
+        tryCompare(publicCountEmblem, "count", 0);
+        tryCompare(publicCountEmblem, "visible", false);
+
+        var privateCountEmblem = waitForChild(privateWindow.contentItem, "countEmblem");
+        verify(privateCountEmblem != null);
+        tryCompare(privateCountEmblem, "count", 0);
+        tryCompare(privateCountEmblem, "visible", false);
+
         // Download pdf in private window
         window = privateWindow;
         browse_to("test.pdf", false);
@@ -119,6 +215,13 @@
         tryCompare(optionsDialog, "visible", true);
         var button = findChild(optionsDialog, "downloadFileButton");
         clickItem(button);
+
+        tryCompare(publicCountEmblem, "count", 0);
+        tryCompare(publicCountEmblem, "visible", false);
+        tryCompare(privateCountEmblem, "count", 1);
+        tryCompare(privateCountEmblem, "visible", true);
+
+        open_downloads();
         downloadsPage = waitForChild(window.contentItem, "downloadsPage");
         verify(downloadsPage != null);
         tryCompare(downloadsPage, "visible", true);
@@ -128,6 +231,9 @@
         compare(delegate.url, baseUrl + "test.pdf");
         verify(delegate.incognito);
 
+        tryCompare(privateCountEmblem, "count", 0);
+        tryCompare(privateCountEmblem, "visible", false);
+
         // Open downloads page in public window, and check that the private
         // download is not there
         window = publicWindow;

=== modified file 'tests/qmltests/webbrowser-app/webbrowser-app-qmltests-launcher.cpp'
--- tests/qmltests/webbrowser-app/webbrowser-app-qmltests-launcher.cpp	2017-03-30 13:48:56 +0000
+++ tests/qmltests/webbrowser-app/webbrowser-app-qmltests-launcher.cpp	2017-03-30 13:48:57 +0000
@@ -315,7 +315,8 @@
     }
 
     QCoreApplication::setOrganizationDomain(QStringLiteral("webbrowser-app-qmltests"));
-    int result = quick_test_main(testArgc, testArgv.data(), "webbrowser-app-qmltests", nullptr);
+    int result = quick_test_main(testArgc, testArgv.data(), "webbrowser-app-qmltests",
+                                 TestDirectory().absolutePath().toLocal8Bit().constData());
     httpServer.terminate();
     httpServer.waitForFinished();
     return result;

=== modified file 'tests/unittests/downloads-model/tst_DownloadsModelTests.cpp'
--- tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2016-09-22 11:45:54 +0000
+++ tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2017-03-30 13:48:57 +0000
@@ -234,6 +234,19 @@
         QVERIFY(!model->data(model->index(0, 0), -1).isValid());
     }
 
+    void shouldReturnDataAsAMap()
+    {
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        QVERIFY(model->get(-1).isEmpty());
+        QVERIFY(!model->get(3)["downloadId"].isValid());
+        QCOMPARE(model->get(0)["downloadId"].toString(), QStringLiteral("testid"));
+        QCOMPARE(model->get(0)["url"].toUrl(), QUrl(QStringLiteral("http://example.org/")));
+        QCOMPARE(model->get(0)["mimetype"].toString(), QStringLiteral("text/plain"));
+        QVERIFY(model->get(0)["created"].toDateTime() <= QDateTime::currentDateTime());
+        QVERIFY(!model->get(0)["complete"].toBool());
+        QVERIFY(!model->get(0)["incognito"].toBool());
+    }
+
     void shouldReturnDatabasePath()
     {
         QCOMPARE(model->databasePath(), QStringLiteral(":memory:"));