webbrowser-app

Merge lp:~osomon/webbrowser-app/settings-page-ap-tests into lp:webbrowser-app

settings-page-ap-tests
Merge into trunk

Proposed by Olivier Tilloy on 2015-03-31

Status:	Merged
Approved by:	Olivier Tilloy on 2015-04-07
Approved revision:	973
Merged at revision:	957
Proposed branch:	lp:~osomon/webbrowser-app/settings-page-ap-tests
Merge into:	lp:webbrowser-app
Prerequisite:	lp:~rpadovani/webbrowser-app/settings-page
Diff against target:	317 lines (+183/-2) 6 files modified README (+2/-2) src/app/webbrowser/SettingsPage.qml (+20/-0) src/app/webbrowser/SettingsPageHeader.qml (+2/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+36/-0) tests/autopilot/webbrowser_app/tests/__init__.py (+9/-0) tests/autopilot/webbrowser_app/tests/test_settings.py (+114/-0)
To merge this branch:	bzr merge lp:~osomon/webbrowser-app/settings-page-ap-tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-07
Ubuntu Phablet Team		2015-03-31	Pending
Review via email: mp+254788@code.launchpad.net

Commit Message

Autopilot tests for the settings UI.

PS Jenkins bot (ps-jenkins) wrote on 2015-03-31:

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

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/settings-page-ap-tests updated on 2015-03-31

969. By Olivier Tilloy on 2015-03-31: Add a test to clear browsing history.
970. By Olivier Tilloy on 2015-03-31: Add a test to reset browser settings.

PS Jenkins bot (ps-jenkins) wrote on 2015-03-31:

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

review: Approve (continuous-integration)

lp:~osomon/webbrowser-app/settings-page-ap-tests updated on 2015-04-01

971. By Olivier Tilloy on 2015-04-01: Updated README.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-01:

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

review: Approve (continuous-integration)

lp:~osomon/webbrowser-app/settings-page-ap-tests updated on 2015-04-07

972. By Olivier Tilloy on 2015-04-07: Merge the latest changes from Riccardo’s branch.
973. By Olivier Tilloy on 2015-04-07: Make test_reset_browser_settings() more complete, by also verifying the state of checkbox options.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-07:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Olivier Tilloy

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file 'README'
 --- README	2015-04-07 13:09:37 +0000
 +++ README	2015-04-07 13:09:38 +0000
@@ -71,8 +71,8 @@
  = Settings =
--webbrowser-app supports a limited set of custom settings, currently not exposed
--in the UI. The settings are persisted on disk in the following INI-like file:
++webbrowser-app supports a limited set of custom settings, persisted on disk in
++the following INI-like file:
      $HOME/.config/webbrowser-app/webbrowser-app.conf
 === modified file 'src/app/webbrowser/SettingsPage.qml'
 --- src/app/webbrowser/SettingsPage.qml	2015-04-07 13:09:37 +0000
 +++ src/app/webbrowser/SettingsPage.qml	2015-04-07 13:09:38 +0000
@@ -87,6 +87,8 @@
+             }
              ListItem.Subtitled {
++                objectName: "homepage"
++
                  text: i18n.tr("Homepage")
                  subText: settingsObject.homepage
@@ -94,6 +96,8 @@
+             }
              ListItem.Standard {
++                objectName: "restoreSession"
++
                  text: i18n.tr("Restore previous session at startup")
                  highlightWhenPressed: false
@@ -109,6 +113,8 @@
+             }
              ListItem.Standard {
++                objectName: "backgroundTabs"
++
                  text: i18n.tr("Allow opening new tabs in background")
                  highlightWhenPressed: false
@@ -127,13 +133,18 @@
+             }
              ListItem.Standard {
++                objectName: "privacy"
++
                  text: i18n.tr("Privacy")
                  onClicked: privacyComponent.createObject(subpageContainer);
+             }
              ListItem.Standard {
++                objectName: "reset"
++
                  text: i18n.tr("Reset browser settings")
++
                  onClicked: settingsObject.restoreDefaults();
+             }
+         }
@@ -198,6 +209,8 @@
              Item {
                  id: privacyItem
++                objectName: "privacySettings"
++
                  anchors.fill: parent
                  Rectangle {
@@ -228,6 +241,7 @@
                          width: parent.width
                          ListItem.Standard {
++                            objectName: "privacy.clearHistory"
                              text: i18n.tr("Clear Browsing History")
                              onClicked: historyModel.clearAll();
                              enabled: historyModel.count > 0
@@ -240,8 +254,11 @@
      Component {
          id: homepageDialog
++
          Dialog {
              id: dialogue
++            objectName: "homepageDialog"
++
              title: i18n.tr("Homepage")
              Component.onCompleted: {
@@ -251,17 +268,20 @@
              TextField {
                  id: homepageTextField
++                objectName: "homepageDialog.text"
                  text: settingsObject.homepage
                  inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly
+             }
              Button {
++                objectName: "homepageDialog.cancelButton"
                  anchors { left: parent.left; right: parent.right }
                  text: i18n.tr("Cancel")
                  onClicked: PopupUtils.close(dialogue);
+             }
              Button {
++                objectName: "homepageDialog.saveButton"
                  anchors { left: parent.left; right: parent.right }
                  text: i18n.tr("Save")
                  color: "#3fb24f"
 === modified file 'src/app/webbrowser/SettingsPageHeader.qml'
 --- src/app/webbrowser/SettingsPageHeader.qml	2015-04-07 13:09:37 +0000
 +++ src/app/webbrowser/SettingsPageHeader.qml	2015-04-07 13:09:38 +0000
@@ -51,6 +51,8 @@
          AbstractButton {
              id: backButton
++            objectName: "backButton"
++
              width: height
              onTriggered: root.back()
 === modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
 --- tests/autopilot/webbrowser_app/emulators/browser.py	2015-03-20 16:14:17 +0000
 +++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-04-07 13:09:38 +0000
@@ -101,6 +101,9 @@
      def get_new_tab_view(self):
          return self.wait_select_single("NewTabView", visible=True)
++    def get_settings_page(self):
++        return self.wait_select_single(SettingsPage, visible=True)
++
      def get_content_picker_dialog(self):
          # only on devices
          return self.wait_select_single("PopupBase",
@@ -257,3 +260,36 @@
          self.isFullyShown.wait_for(True)
          action = self.select_single("ToolbarAction", objectName=name)
          self.pointing_device.click_object(action)
++
++
++class SettingsPage(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    def get_header(self):
++        return self.select_single(SettingsPageHeader)
++
++    def get_homepage_entry(self):
++        return self.select_single("Subtitled", objectName="homepage")
++
++    def get_restore_session_entry(self):
++        return self.select_single("Standard", objectName="restoreSession")
++
++    def get_background_tabs_entry(self):
++        return self.select_single("Standard", objectName="backgroundTabs")
++
++    def get_privacy_entry(self):
++        return self.select_single("Standard", objectName="privacy")
++
++    def get_privacy_page(self):
++        return self.wait_select_single("QQuickItem",
++                                       objectName="privacySettings")
++
++    def get_reset_settings_entry(self):
++        return self.select_single("Standard", objectName="reset")
++
++
++class SettingsPageHeader(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    @autopilot.logging.log_action(logger.info)
++    def click_back_button(self):
++        button = self.select_single("AbstractButton", objectName="backButton")
++        self.pointing_device.click_object(button)
 === modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
 --- tests/autopilot/webbrowser_app/tests/__init__.py	2015-03-23 07:49:19 +0000
 +++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-04-07 13:09:38 +0000
@@ -123,6 +123,15 @@
                  self.main_window.address_bar.activeFocus,
                  Eventually(Equals(True)))
++    def open_settings(self):
++        chrome = self.main_window.chrome
++        drawer_button = chrome.get_drawer_button()
++        self.pointing_device.click_object(drawer_button)
++        chrome.get_drawer()
++        settings_action = chrome.get_drawer_action("settings")
++        self.pointing_device.click_object(settings_action)
++        return self.main_window.get_settings_page()
++
      def assert_number_webviews_eventually(self, count):
          self.assertThat(lambda: len(self.main_window.get_webviews()),
                          Eventually(Equals(count)))
 === added file 'tests/autopilot/webbrowser_app/tests/test_settings.py'
 --- tests/autopilot/webbrowser_app/tests/test_settings.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_settings.py	2015-04-07 13:09:38 +0000
@@ -0,0 +1,114 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright 2015 Canonical
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++#
++# This program 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/>.
++
++from datetime import datetime
++
++from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
++
++from testtools.matchers import Equals, NotEquals
++from autopilot.matchers import Eventually
++from autopilot.platform import model
++
++import ubuntuuitoolkit as uitk
++
++from webbrowser_app.emulators import browser
++
++
++class TestSettings(StartOpenRemotePageTestCaseBase):
++
++    def get_homepage_dialog(self):
++        return self.main_window.wait_select_single("Dialog",
++                                                   objectName="homepageDialog")
++
++    def test_open_close_settings_page(self):
++        settings = self.open_settings()
++        settings.get_header().click_back_button()
++        settings.wait_until_destroyed()
++
++    def test_change_homepage(self):
++        settings = self.open_settings()
++        homepage = settings.get_homepage_entry()
++        old = homepage.subText
++        self.assertThat(old, NotEquals(""))
++
++        # First test cancelling the edition
++        self.pointing_device.click_object(homepage)
++        dialog = self.get_homepage_dialog()
++        textField = dialog.select_single(uitk.TextField,
++                                         objectName="homepageDialog.text")
++        self.assertThat(textField.text, Eventually(Equals(old)))
++        cancel_button = dialog.select_single(
++            "Button",
++            objectName="homepageDialog.cancelButton")
++        self.pointing_device.click_object(cancel_button)
++        dialog.wait_until_destroyed()
++        self.assertThat(homepage.subText, Equals(old))
++
++        # Then test actually changing the homepage
++        self.pointing_device.click_object(homepage)
++        dialog = self.get_homepage_dialog()
++        textField = dialog.select_single(uitk.TextField,
++                                         objectName="homepageDialog.text")
++        self.assertThat(textField.text, Eventually(Equals(old)))
++        self.pointing_device.click_object(textField)
++        textField.activeFocus.wait_for(True)
++        new = "http://example.org/{}".format(int(datetime.now().timestamp()))
++        textField.write(new, True)
++        save_button = dialog.select_single(
++            "Button",
++            objectName="homepageDialog.saveButton")
++        self.pointing_device.click_object(save_button)
++        dialog.wait_until_destroyed()
++        self.assertThat(homepage.subText, Eventually(Equals(new)))
++
++    def test_open_close_privacy_settings(self):
++        settings = self.open_settings()
++        privacy = settings.get_privacy_entry()
++        self.pointing_device.click_object(privacy)
++        privacy_page = settings.get_privacy_page()
++        privacy_header = privacy_page.select_single(browser.SettingsPageHeader)
++        privacy_header.click_back_button()
++        privacy_page.wait_until_destroyed()
++
++    def test_clear_browsing_history(self):
++        settings = self.open_settings()
++        privacy = settings.get_privacy_entry()
++        self.pointing_device.click_object(privacy)
++        privacy_page = settings.get_privacy_page()
++        clear_history = privacy_page.select_single(
++            "Standard",
++            objectName="privacy.clearHistory")
++        self.assertThat(clear_history.enabled, Equals(True))
++        self.pointing_device.click_object(clear_history)
++        self.assertThat(clear_history.enabled, Eventually(Equals(False)))
++
++    def test_reset_browser_settings(self):
++        settings = self.open_settings()
++        reset = settings.get_reset_settings_entry()
++        self.pointing_device.click_object(reset)
++
++        homepage = settings.get_homepage_entry()
++        self.assertThat(homepage.subText,
++                        Eventually(Equals("http://start.ubuntu.com")))
++
++        restore_session = settings.get_restore_session_entry()
++        checkbox = restore_session.select_single(uitk.CheckBox)
++        self.assertThat(checkbox.checked, Eventually(Equals(True)))
++
++        background_tabs = settings.get_background_tabs_entry()
++        checkbox = background_tabs.select_single(uitk.CheckBox)
++        self.assertThat(checkbox.checked,
++                        Eventually(Equals(model() == 'Desktop')))

webbrowser-app

Merge lp:~osomon/webbrowser-app/settings-page-ap-tests into lp:webbrowser-app

Commit Message

Description of the Change

Preview Diff

Subscribers