webbrowser-app

Merge lp://staging/~osomon/webbrowser-app/browserpage into lp://staging/webbrowser-app

  1. browserpage
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1458
Merged at revision: 1456
Proposed branch: lp://staging/~osomon/webbrowser-app/browserpage
Merge into: lp://staging/webbrowser-app
Diff against target: 2190 lines (+688/-845)
17 files modified
src/app/webbrowser/BookmarksView.qml (+5/-48)
src/app/webbrowser/BookmarksViewWide.qml (+6/-49)
src/app/webbrowser/Browser.qml (+12/-21)
src/app/webbrowser/BrowserPage.qml (+79/-0)
src/app/webbrowser/BrowserPageHeader.qml (+0/-119)
src/app/webbrowser/DownloadsPage.qml (+99/-101)
src/app/webbrowser/HistoryView.qml (+52/-105)
src/app/webbrowser/HistoryViewWide.qml (+94/-167)
src/app/webbrowser/SettingsPage.qml (+102/-162)
tests/autopilot/webbrowser_app/emulators/browser.py (+16/-14)
tests/autopilot/webbrowser_app/tests/test_keyboard.py (+1/-1)
tests/autopilot/webbrowser_app/tests/test_settings.py (+2/-2)
tests/unittests/qml/tst_BookmarksView.qml (+6/-6)
tests/unittests/qml/tst_BookmarksViewWide.qml (+7/-7)
tests/unittests/qml/tst_BrowserPage.qml (+151/-0)
tests/unittests/qml/tst_HistoryView.qml (+11/-11)
tests/unittests/qml/tst_HistoryViewWide.qml (+45/-32)
To merge this branch: bzr merge lp://staging/~osomon/webbrowser-app/browserpage
Reviewer Review Type Date Requested Status
Olivier Tilloy Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+293891@code.staging.launchpad.net

Commit message

Introduce a BrowserPage type for consistency between all pages, and use the UITK Page and PageHeader types.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1457
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/478/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/480/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/480
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/479
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/479
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/486/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/486/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/486/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/486/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/486/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/486
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/486/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/478/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~osomon/webbrowser-app/browserpage updated
1458. By Olivier Tilloy

Make unit tests more robust.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1458
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/479/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/481/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/481
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/480
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/480
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/487/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/487
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/487/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/487/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/487
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/487/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/487/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/487
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/487/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/479/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

There are two unit test failures that I can reliably reproduce in a vivid chroot (with the stable overlay PPA enabled). I don’t get those failures on xenial.

2: FAIL! : QmlTests::HistoryViewWide::test_search_highlight() property text
2: Actual ():
2: Expected (): 1 Example
2: Loc: [/tmp/browserpage/tests/unittests/qml/tst_HistoryViewWide.qml(334)]
2: FAIL! : QmlTests::HistoryViewWide::test_search_updates_dates_list() property text
2: Actual (): Alan
2: Expected (): Al
2: Loc: [/tmp/browserpage/tests/unittests/qml/tst_HistoryViewWide.qml(390)]

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

Those failures are yet another occurrence of bug #1545802: I’ve instrumented the tests, and when the failures happen the TextField has activeFocus, not the QQuickTextInput inside it, so sending key events doesn’t input any text.

Revision history for this message
Olivier Tilloy (osomon) wrote :

Bug #1545802 has now been fixed, unit tests pass again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: