Merge lp://qastaging/~osomon/webbrowser-app/staging-trunk-landing-20161023 into lp://qastaging/webbrowser-app
Status: | Merged |
---|---|
Approved by: | Andrew Hayzen |
Approved revision: | 1565 |
Merged at revision: | 1552 |
Proposed branch: | lp://qastaging/~osomon/webbrowser-app/staging-trunk-landing-20161023 |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
4991 lines (+2469/-1161) 52 files modified
.bzrignore (+1/-0) CMakeLists.txt (+3/-6) debian/changelog (+35/-0) debian/control (+1/-2) debian/rules (+2/-1) make-snap.sh (+4/-0) setup/gui/webbrowser-app.desktop.in (+27/-0) snap/webbrowser-app.launcher (+10/-0) snapcraft.yaml (+66/-0) src/Ubuntu/CMakeLists.txt (+0/-8) src/Ubuntu/Web/UbuntuWebContext.qml (+7/-1) src/Ubuntu/Web/ua-overrides-desktop.js.in (+10/-9) src/Ubuntu/Web/ua-overrides-mobile.js.in (+13/-11) src/app/AlertDialog.qml (+2/-0) src/app/BeforeUnloadDialog.qml (+3/-0) src/app/ChromeBase.qml (+5/-3) src/app/ConfirmDialog.qml (+3/-0) src/app/Downloader.qml (+3/-11) src/app/PromptDialog.qml (+4/-0) src/app/ThinProgressBar.qml (+3/-6) src/app/WebViewImpl.qml (+2/-2) src/app/config.h.in (+3/-2) src/app/webbrowser/BookmarkOptions.qml (+25/-4) src/app/webbrowser/Browser.qml (+112/-596) src/app/webbrowser/BrowserTab.qml (+4/-3) src/app/webbrowser/Chrome.qml (+30/-5) src/app/webbrowser/DownloadDelegate.qml (+151/-149) src/app/webbrowser/DownloadsPage.qml (+10/-2) src/app/webbrowser/HistoryViewWithExpansion.qml (+67/-0) src/app/webbrowser/NavigationBar.qml (+3/-11) src/app/webbrowser/TabComponent.qml (+436/-0) src/app/webbrowser/TabItem.qml (+16/-4) src/app/webbrowser/TabsBar.qml (+51/-6) src/app/webbrowser/downloads-model.cpp (+139/-80) src/app/webbrowser/downloads-model.h (+7/-9) src/app/webbrowser/history-model.cpp (+251/-152) src/app/webbrowser/history-model.h (+64/-7) src/app/webbrowser/webbrowser-app.qml (+28/-9) src/app/webcontainer/Chrome.qml (+4/-0) src/app/webcontainer/WebApp.qml (+2/-1) tests/autopilot/webapp_container/tests/__init__.py (+9/-6) tests/autopilot/webapp_container/tests/fake_servers.py (+34/-0) tests/autopilot/webapp_container/tests/test_js_dialogs.py (+216/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+64/-2) tests/autopilot/webbrowser_app/tests/http_server.py (+48/-0) tests/autopilot/webbrowser_app/tests/test_history.py (+35/-0) tests/autopilot/webbrowser_app/tests/test_js_dialogs.py (+158/-0) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+1/-8) tests/unittests/downloads-model/tst_DownloadsModelTests.cpp (+262/-43) tests/unittests/history-model/tst_HistoryModelTests.cpp (+3/-2) tests/unittests/qml/CMakeLists.txt (+6/-0) tests/unittests/qml/tst_TabsBar.qml (+26/-0) |
To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/staging-trunk-landing-20161023 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Hayzen (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
[ Andrew Hayzen ]
* Fix for issue where many tabs causes close button to overlap other tabs (LP: #1473630)
* When page has started, stopped, redirected or errored clear cache for history update - which prevents incorrect titles in being set (LP: #1603835)
* Add autopilot tests javascript dialogs to webbrowser and webapp-container - alertDialog, beforeUnloadDialog, confirmDialog and promptDialog (LP: #1633040)
* Add user-agent override to display the new twitter mobile interface (LP: #1577834)
[ Florian Boucault ]
* Improved startup time by 800ms by delaying QML compilation and making it asynchronous
[ Olivier Tilloy ]
* Replace chromium version in UA overrides at runtime, not at build time (LP: #1599695)
* Initial support for generating a snap package for webbrowser-app (LP: #1629009)
* Do not persist references to incognito downloads on disk (LP: #1625519)
* Increase test coverage (to 97.5%) for DownloadsModel (LP: #1534102)
* Various performance optimizations linked to load events (LP: #1611680)
* Ensure a tab is loaded when re-opened (LP: #1632246)
* Fix drag'n'drop of bookmarks within the new tab view (LP: #1584868)
* Work around a limitation in the sound and microphone policy groups to "fix" sound in yakkety an zesty (LP: #1632620)
FAILED: Continuous integration, rev:1565 /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 716/ /jenkins. canonical. com/system- apps/job/ build/1877 /jenkins. canonical. com/system- apps/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= default/ 454/console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1878 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1718/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1718 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1718/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 716/rebuild
https:/