Merge lp://qastaging/~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests into lp://qastaging/webbrowser-app
Proposed by
Andrew Hayzen
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests | ||||
Merge into: | lp://qastaging/webbrowser-app | ||||
Diff against target: |
5186 lines (+2471/-1203) 51 files modified
.bzrignore (+1/-0) CMakeLists.txt (+3/-6) debian/control (+1/-2) make-snap.sh (+4/-0) po/webbrowser-app.pot (+49/-43) 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 (+9/-9) src/Ubuntu/Web/ua-overrides-mobile.js.in (+11/-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 (+1/-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 (+214/-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 (+156/-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/~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
* Add autopilot tests javascript dialogs to webbrowser and webapp-container - alertDialog, beforeUnloadDialog, confirmDialog and promptDialog
Description of the change
* Add autopilot tests javascript dialogs to webbrowser and webapp-container - alertDialog, beforeUnloadDialog, confirmDialog and promptDialog
TESTING:
Run the following test suites:
webapp_
webbrowser_
To post a comment you must log in.
FAILED: Continuous integration, rev:1560 /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 705/ /jenkins. canonical. com/system- apps/job/ build/1837/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1838 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1678/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1678/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1678/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1678 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1678/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
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:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 705/rebuild
https:/