Merge lp:~osomon/webbrowser-app/address-downloads-issues into lp:webbrowser-app

[Olivier Tilloy]

Address a number of minor functional and code issues in the new downloads-in-browser functionality.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1335
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2559/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5997
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1312
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6008
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6008/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26578

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2559/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good :)

review: Approve

=== modified file 'src/app/BrowserView.qml'
--- src/app/BrowserView.qml	2015-08-10 15:22:00 +0000
+++ src/app/BrowserView.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -20,7 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
-Item {
+FocusScope {
     property bool developerExtrasEnabled: false
 
     property var currentWebview: null

=== modified file 'src/app/Downloader.qml'
--- src/app/Downloader.qml	2015-12-16 15:03:32 +0000
+++ src/app/Downloader.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -54,13 +54,11 @@
     }
 
     function download(url, contentType, headers, metadata) {
-        var singleDownload = downloadComponent.createObject(downloadItem)
-        singleDownload.contentType = contentType
-        if (headers) { 
-            singleDownload.headers = headers
+        var properties = {'contentType': contentType, 'metadata': metadata, 'url': url}
+        if (headers) {
+            properties['headers'] = headers
         }
-        singleDownload.metadata = metadata
-        singleDownload.url = url
+        var singleDownload = downloadComponent.createObject(downloadItem, properties)
         singleDownload.download(url)
     }
 
@@ -98,5 +96,4 @@
     function is7digital(url) {
         return url.toString().search(/[^\/]+:\/\/[^\/]*7digital.com\//) !== -1
     }
-
 }

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-01-12 17:42:01 +0000
+++ src/app/webbrowser/Browser.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -38,8 +38,7 @@
 
     currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null
 
-    property var downloadsModel: (downloadsModelLoader.status == Loader.Ready) ? downloadsModelLoader.item : null
-    property var downloadManager: (downloadHandlerLoader.status == Loader.Ready) ? downloadHandlerLoader.item : null
+    readonly property var downloadManager: (downloadHandlerLoader.status == Loader.Ready) ? downloadHandlerLoader.item : null
 
     property bool newSession: false
 
@@ -545,9 +544,7 @@
                 text: i18n.tr("Downloads")
                 iconName: "save"
                 enabled: downloadHandlerLoader.status == Loader.Ready && contentHandlerLoader.status == Loader.Ready
-                onTriggered: {
-                    currentWebview.showDownloadsPage()
-                }
+                onTriggered: downloadsViewLoader.active = true
             },
             Action {
                 objectName: "privatemode"
@@ -933,7 +930,6 @@
 
         onStatusChanged: {
             if (status == Loader.Ready) {
-                item.downloadsModel = browser.downloadsModel
                 item.forceActiveFocus()
             } else {
                 internal.resetFocus()
@@ -948,12 +944,16 @@
             }
         }
 
+        Binding {
+            target: downloadsViewLoader.item
+            property: "downloadManager"
+            value: browser.downloadManager
+        }
+
         Connections {
             target: downloadsViewLoader.item
-
             onDone: downloadsViewLoader.active = false
         }
-
     }
 
     TabsModel {
@@ -982,14 +982,9 @@
     }
 
     Loader {
-        id: downloadsModelLoader
-        source: "DownloadsModel.qml"
-        asynchronous: true
-    }
-
-    Loader {
         id: downloadHandlerLoader
         source: "DownloadHandler.qml"
+        asynchronous: true
     }
 
     Component {
@@ -1322,9 +1317,9 @@
                 }
 
                 function startDownload(downloadId, download, mimeType) {
-                    downloadsModel.add(downloadId, download.url, mimeType)
+                    DownloadsModel.add(downloadId, download.url, mimeType)
                     download.start()
-                    showDownloadsPage()
+                    downloadsViewLoader.active = true
                 }
 
             }
@@ -1752,6 +1747,7 @@
 
             BookmarksModel.databasePath = dataLocation + "/bookmarks.sqlite"
             HistoryModel.databasePath = dataLocation + "/history.sqlite"
+            DownloadsModel.databasePath = dataLocation + "/downloads.sqlite"
 
             // Note that the property setter for databasePath won't return until
             // the entire model has been loaded, so it is safe to call this here
@@ -1995,12 +1991,15 @@
             onTriggered: chrome.findInPageMode = true
         }
 
-        // Ctrl + J: Show downloads page
+        // Ctrl+J: Show downloads page
         KeyboardShortcut {
             modifiers: Qt.ControlModifier
             key: Qt.Key_J
-            enabled: chrome.visible && !downloadsViewLoader.active
-            onTriggered: currentWebview.showDownloadsPage()
+            enabled: chrome.visible &&
+                     downloadHandlerLoader.status == Loader.Ready &&
+                     contentHandlerLoader.status == Loader.Ready &&
+                     !downloadsViewLoader.active
+            onTriggered: downloadsViewLoader.active = true
         }
 
         // Ctrl+Shift+G: Find previous
@@ -2023,6 +2022,7 @@
     Loader {
         id: contentHandlerLoader
         source: "ContentHandler.qml"
+        asynchronous: true
     }
 
     Connections {

=== modified file 'src/app/webbrowser/BrowserPageHeader.qml'
--- src/app/webbrowser/BrowserPageHeader.qml	2015-12-16 09:57:25 +0000
+++ src/app/webbrowser/BrowserPageHeader.qml	2016-01-12 17:42:01 +0000
@@ -43,6 +43,12 @@
         right: parent.right
     }
 
+    MouseArea {
+        // Prevent click events from propagating through to the view below
+        anchors.fill: parent
+        acceptedButtons: Qt.AllButtons
+    }
+
     Rectangle {
         id: title
 

=== modified file 'src/app/webbrowser/ContentDownloadDialog.qml'
--- src/app/webbrowser/ContentDownloadDialog.qml	2015-12-16 10:11:46 +0000
+++ src/app/webbrowser/ContentDownloadDialog.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -36,7 +36,7 @@
         property alias contentType: peerPicker.contentType
 
         signal startDownload(string downloadId, var download, string mimeType)
-    
+
         Component {
             id: downloadOptionsComponent
             Dialog {
@@ -44,18 +44,18 @@
                 objectName: "downloadOptionsDialog"
                 Column {
                     spacing: units.gu(2)
-    
+
                     Item {
                         width: parent.width
                         height: mimetypeIcon.height
-    
+
                         Icon {
                             id: mimetypeIcon
                             name: icon != "" ? icon : "save"
                             height: units.gu(4.5)
                             width: height
                         }
-    
+
                         Label {
                             id: filenameLabel
                             anchors.top: mimetypeIcon.top
@@ -66,7 +66,7 @@
                             elide: Text.ElideMiddle
                             text: downloadDialog.filename
                         }
-    
+
                         Label {
                             anchors.top: filenameLabel.bottom
                             anchors.left: filenameLabel.left
@@ -76,14 +76,14 @@
                             text: MimeDatabase.nameForMimetype(downloadDialog.mimeType)
                         }
                     }
-    
+
                     Label {
                         width: parent.width
                         text: i18n.tr("Choose an application to open this file or add it to the downloads folder.")
                         wrapMode: Text.Wrap
                         visible: peerModel.peers.length > 0
                     }
-    
+
                     Button {
                         text: i18n.tr("Choose an application")
                         objectName: "chooseAppButton"
@@ -96,7 +96,7 @@
                             pickerRect.visible = true
                         }
                     }
-    
+
                     Button {
                         text: i18n.tr("Download")
                         objectName: "downloadFileButton"
@@ -108,7 +108,7 @@
                             PopupUtils.close(downloadDialog)
                         }
                     }
-    
+
                     Button {
                         text: i18n.tr("Cancel")
                         objectName: "cancelDownloadButton"
@@ -117,18 +117,16 @@
                         height: units.gu(4)
                         onClicked: PopupUtils.close(downloadDialog)
                     }
-    
                 }
             }
-    
         }
-    
+
         ContentPeerModel {
             id: peerModel
             handler: ContentHandler.Destination
             contentType: downloadDialog.contentType
         }
-    
+
         Rectangle {
             id: pickerRect
             anchors.fill: parent
@@ -138,20 +136,20 @@
                 handler: ContentHandler.Destination
                 objectName: "contentPeerPicker"
                 visible: parent.visible
-    
+
                 onPeerSelected: {
                     activeTransfer = peer.request()
                     activeTransfer.downloadId = downloadDialog.downloadId
                     activeTransfer.state = ContentTransfer.Downloading
                     PopupUtils.close(downloadDialog)
                 }
-    
+
                 onCancelPressed: {
                     PopupUtils.close(downloadDialog)
                 }
             }
         }
-    
+
         Component.onCompleted: {
             PopupUtils.open(downloadOptionsComponent, downloadDialog)
         }

=== modified file 'src/app/webbrowser/ContentPickerDialog.qml'
--- src/app/webbrowser/ContentPickerDialog.qml	2015-12-16 10:11:46 +0000
+++ src/app/webbrowser/ContentPickerDialog.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -55,12 +55,12 @@
                         // If we're inside the browser and the user has
                         // requested content from the browser then we
                         // need to handle the transfer internally
-                        var downloadPage = picker.WebView.view.showDownloadsPage()
-                        downloadPage.mimetypeFilter = MimeTypeMapper.mimeTypeRegexForContentType(contentType)
-                        downloadPage.multiSelect = model.allowMultipleFiles
-                        downloadPage.selectMode = false
-                        downloadPage.pickingMode = true
-                        downloadPage.internalFilePicker = model
+                        var downloadsPage = picker.WebView.view.showDownloadsPage()
+                        downloadsPage.mimetypeFilter = MimeTypeMapper.mimeTypeRegexForContentType(contentType)
+                        downloadsPage.multiSelect = model.allowMultipleFiles
+                        downloadsPage.selectMode = false
+                        downloadsPage.pickingMode = true
+                        downloadsPage.internalFilePicker = model
                         Popups.PopupUtils.close(picker)
                     } else {
                         if (model.allowMultipleFiles) {

=== modified file 'src/app/webbrowser/DownloadDelegate.qml'
--- src/app/webbrowser/DownloadDelegate.qml	2015-12-16 16:25:05 +0000
+++ src/app/webbrowser/DownloadDelegate.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,13 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import ".."
 
 ListItem {
     id: downloadDelegate
 
+    property var downloadManager
+
     property alias icon: mimeicon.name
     property alias image: thumbimage.source
     property alias title: title.text
@@ -41,17 +43,23 @@
 
     height: visible ? (incomplete ? (paused ? units.gu(13) : units.gu(10)) : units.gu(7)) : 0
 
-    Component.onCompleted: {
-        if (incomplete) {
-            // Connect to download object
-            for(var i = 0; i < downloadManager.downloads.length; i++) {
-                if (downloadManager.downloads[i].downloadId == downloadId) {
-                    download = downloadManager.downloads[i]
+    QtObject {
+        id: internal
+
+        function connectToDownloadObject() {
+            if (incomplete && !download && downloadManager) {
+                for(var i = 0; i < downloadManager.downloads.length; i++) {
+                    if (downloadManager.downloads[i].downloadId == downloadId) {
+                        download = downloadManager.downloads[i]
+                    }
                 }
             }
         }
     }
 
+    Component.onCompleted: internal.connectToDownloadObject()
+    onDownloadManagerChanged: internal.connectToDownloadObject()
+
     Item {
         
         anchors {

=== modified file 'src/app/webbrowser/DownloadHandler.qml'
--- src/app/webbrowser/DownloadHandler.qml	2015-11-30 12:12:25 +0000
+++ src/app/webbrowser/DownloadHandler.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -18,28 +18,29 @@
 
 import QtQuick 2.4
 import Ubuntu.DownloadManager 1.2
+import webbrowserapp.private 0.1
 
 DownloadManager {
-    id: downloadManager
-
     onDownloadFinished: {
-        downloadsModel.moveToDownloads(download.downloadId, path)
-        downloadsModel.setComplete(download.downloadId, true)
+        if (DownloadsModel.contains(download.downloadId)) {
+            DownloadsModel.moveToDownloads(download.downloadId, path)
+        }
+        DownloadsModel.setComplete(download.downloadId, true)
     }
 
     onDownloadPaused: {
-        downloadsModel.pauseDownload(download.downloadId)
+        DownloadsModel.pauseDownload(download.downloadId)
     }
 
     onDownloadResumed: {
-        downloadsModel.resumeDownload(download.downloadId)
+        DownloadsModel.resumeDownload(download.downloadId)
     }
 
     onDownloadCanceled: {
-        downloadsModel.cancelDownload(download.downloadId)
+        DownloadsModel.cancelDownload(download.downloadId)
     }
 
     onErrorFound: {
-        downloadsModel.setError(download.downloadId, download.errorMessage)
+        DownloadsModel.setError(download.downloadId, download.errorMessage)
     }
 }

=== removed file 'src/app/webbrowser/DownloadsModel.qml'
--- src/app/webbrowser/DownloadsModel.qml	2015-08-10 13:58:52 +0000
+++ src/app/webbrowser/DownloadsModel.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2015 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.0
-import webbrowserapp.private 0.1
-
-DownloadsModel {
-    databasePath: dataLocation + "/downloads.sqlite"
-}

=== modified file 'src/app/webbrowser/DownloadsPage.qml'
--- src/app/webbrowser/DownloadsPage.qml	2016-01-12 17:42:01 +0000
+++ src/app/webbrowser/DownloadsPage.qml	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Content 1.3
 import Ubuntu.Web 0.2
 import webbrowserapp.private 0.1
@@ -30,7 +30,7 @@
 Item {
     id: downloadsItem
 
-    property QtObject downloadsModel
+    property var downloadManager
 
     // We can get file picking requests either via content-hub (activeTransfer)
     // Or via the internal oxide file picker (internalFilePicker) in the case
@@ -104,6 +104,7 @@
                 text: i18n.tr("Delete")
                 iconName: "delete"
                 visible: selectMode
+                enabled: downloadsListView.ViewItems.selectedIndices.length > 0
                 onTriggered: {
                     var toDelete = []
                     for (var i = 0; i < downloadsListView.ViewItems.selectedIndices.length; i++) {
@@ -111,7 +112,7 @@
                         toDelete.push(selectedDownload.path)
                     }
                     for (var i = 0; i < toDelete.length; i++) {
-                        downloadsModel.deleteDownload(toDelete[i])
+                        DownloadsModel.deleteDownload(toDelete[i])
                     }
                     downloadsListView.ViewItems.selectedIndices = []
                     downloadsItem.selectMode = false
@@ -120,6 +121,7 @@
             Action {
                 iconName: "edit" 
                 visible: !selectMode && !pickingMode
+                enabled: downloadsListView.count > 0
                 onTriggered: {
                     selectMode = true
                     multiSelect = true
@@ -159,7 +161,7 @@
         }
 
         model: SortFilterModel {
-            model: downloadsModel
+            model: DownloadsModel
             filter { 
                 id: downloadModelFilter
                 property: "mimetype"
@@ -167,6 +169,7 @@
         }
 
         delegate: DownloadDelegate {
+            downloadManager: downloadsItem.downloadManager
             downloadId: model.downloadId
             title: model.filename ? model.filename : model.url.toString().split('/').pop().split('?').shift()
             url: model.url
@@ -212,12 +215,12 @@
 
             onRemoved: {
                 if (model.complete) {
-                    downloadsModel.deleteDownload(model.path)
+                    DownloadsModel.deleteDownload(model.path)
                 }
             }
 
             onCancelled: {
-                downloadsModel.cancelDownload(model.downloadId)
+                DownloadsModel.cancelDownload(model.downloadId)
             }
         }
 

=== modified file 'src/app/webbrowser/downloads-model.cpp'
--- src/app/webbrowser/downloads-model.cpp	2015-11-23 14:48:28 +0000
+++ src/app/webbrowser/downloads-model.cpp	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -20,12 +20,12 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtSql/QSqlQuery>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
 #include <QtCore/QMimeDatabase>
 #include <QtCore/QMimeType>
+#include <QtCore/QStandardPaths>
+#include <QtSql/QSqlQuery>
 
 #define CONNECTION_NAME "webbrowser-app-downloads"
 
@@ -204,6 +204,16 @@
     }
 }
 
+bool DownloadsModel::contains(const QString& downloadId) const
+{
+    Q_FOREACH(const DownloadEntry& entry, m_orderedEntries) {
+        if (entry.downloadId == downloadId) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /*!
     Add a download to the database. This should happen as soon as the download
     is started.
@@ -282,20 +292,18 @@
         QString destination = dir + QDir::separator() + filenameWithoutSuffix + suffix;
         // Avoid filename collision by automatically inserting an incremented
         // number into the filename if the original name already exists.
-        if (QFile::exists(destination)) {
-            int append = 1;
-            do {
-                destination = QString("%1%2.%3").arg(dir + QDir::separator() + filenameWithoutSuffix, QString::number(append), suffix);
-                append++;
-            } while (QFile::exists(destination));
+        int append = 1;
+        while (QFile::exists(destination)) {
+            destination = QString("%1%2.%3").arg(dir + QDir::separator() + filenameWithoutSuffix, QString::number(append), suffix);
+            ++append;
         }
         if (file.rename(destination)) {
             setPath(downloadId, destination);
         } else {
-            qWarning() << "Failed moving file from " << path << " to " << destination;
+            qWarning() << "Failed moving file from" << path << "to" << destination;
         }
     } else {
-        qWarning() << "Download not found: " << path;
+        qWarning() << "Download not found:" << path;
     }
 }
 

=== modified file 'src/app/webbrowser/downloads-model.h'
--- src/app/webbrowser/downloads-model.h	2015-11-23 14:48:28 +0000
+++ src/app/webbrowser/downloads-model.h	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -62,7 +62,8 @@
     const QString databasePath() const;
     void setDatabasePath(const QString& path);
 
-    Q_INVOKABLE void add(const QString &downloadId, const QUrl& url, const QString& mimetype);
+    Q_INVOKABLE bool contains(const QString& downloadId) const;
+    Q_INVOKABLE void add(const QString& downloadId, const QUrl& url, const QString& mimetype);
     Q_INVOKABLE void moveToDownloads(const QString& downloadId, const QString& path);
     Q_INVOKABLE void setPath(const QString& downloadId, const QString& path);
     Q_INVOKABLE void setComplete(const QString& downloadId, const bool complete);

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2015-12-10 09:06:06 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -47,33 +47,18 @@
 {
 }
 
-static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new FileOperations();
-}
-
-static QObject* CacheDeleter_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new CacheDeleter();
-}
-
-static QObject* BookmarksModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new BookmarksModel();
-}
-
-static QObject* HistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new HistoryModel();
-}
+#define MAKE_SINGLETON_FACTORY(type) \
+    static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \
+        Q_UNUSED(engine); \
+        Q_UNUSED(scriptEngine); \
+        return new type(); \
+    }
+
+MAKE_SINGLETON_FACTORY(FileOperations)
+MAKE_SINGLETON_FACTORY(CacheDeleter)
+MAKE_SINGLETON_FACTORY(BookmarksModel)
+MAKE_SINGLETON_FACTORY(HistoryModel)
+MAKE_SINGLETON_FACTORY(DownloadsModel)
 
 bool WebbrowserApp::initialize()
 {
@@ -88,7 +73,7 @@
     qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
     qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine");
     qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory);
-    qmlRegisterType<DownloadsModel>(uri, 0, 1, "DownloadsModel");
+    qmlRegisterSingletonType<DownloadsModel>(uri, 0, 1, "DownloadsModel", DownloadsModel_singleton_factory);
     qmlRegisterType<TextSearchFilterModel>(uri, 0, 1, "TextSearchFilterModel");
 
     if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml")) {

=== modified file 'tests/unittests/downloads-model/tst_DownloadsModelTests.cpp'
--- tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2015-12-11 13:38:52 +0000
+++ tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2016-01-12 17:42:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -60,6 +60,13 @@
         QVERIFY(roleNames.contains("created"));
     }
 
+    void shouldContainAddedEntries()
+    {
+        QVERIFY(!model->contains(QStringLiteral("testid")));
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/html"));
+        QVERIFY(model->contains(QStringLiteral("testid")));
+    }
+
     void shouldAddNewEntries()
     {
         QSignalSpy spy(model, SIGNAL(added(QString, QUrl, QString)));

=== modified file 'tests/unittests/qml/tst_Suggestions.qml'
--- tests/unittests/qml/tst_Suggestions.qml	2015-08-05 11:18:08 +0000
+++ tests/unittests/qml/tst_Suggestions.qml	2016-01-12 17:42:01 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 1.0
 import "../../../src/app/webbrowser"