ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/1219793-reset into lp:ubuntu-system-settings

1219793-reset
Merge into trunk

Proposed by Jonas G. Drange on 2014-07-30

Status:

Merged

Approved by:

Ken VanDine on 2014-08-07

Approved revision:

851

Merged at revision:

875

Proposed branch:

lp:~jonas-drange/ubuntu-system-settings/1219793-reset

Merge into:

lp:ubuntu-system-settings

Diff against target:

640 lines (+350/-62)

11 files modified

plugins/reset/CMakeLists.txt (+2/-0)
plugins/reset/EntryComponent.qml (+1/-1)
plugins/reset/EraseEverything.qml (+22/-4)
plugins/reset/PageComponent.qml (+21/-8)
plugins/reset/ResetLauncherHome.qml (+27/-6)
plugins/reset/reset.cpp (+39/-33)
plugins/reset/reset.h (+5/-2)
plugins/reset/reset.settings (+1/-2)
tests/autopilot/ubuntu_system_settings/__init__.py (+118/-3)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+64/-3)
tests/autopilot/ubuntu_system_settings/tests/test_reset.py (+50/-0)

To merge this branch:

bzr merge lp:~jonas-drange/ubuntu-system-settings/1219793-reset

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine		2014-07-30	Approve on 2014-08-07
PS Jenkins bot	continuous-integration		Approve on 2014-08-01
Leo Arias (community)			Needs Fixing on 2014-07-31
Review via email: mp+228954@code.launchpad.net

Commit message

[reset] bring back reset and hook it up to the backend. Added happy path tests.

Description of the change

Hi,

this branch makes reset visible by default and exposes "Reset Launcher" and "Erase Everything…" to the user.

The ux has been altered slightly to conform to the new spec.

Binding for factory reset was also written.

Thanks

Revision history for this message

Omer Akram (om26er) wrote on 2014-07-31:

You should make sure to backup launcher icons before running tests and restore them at the end.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1106/rebuild

review: Approve (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-31:

408 + def test_reset_page_title_is_correct(self):

This is not a good autopilot tests because it doesn't represent a user story. We are not testing there the reason why the user opens the app. It would be better as a QML test, but as the project currently has no QML tests, it's ok for now.

308 + sleep(2)
334 + sleep(2)

Sleeps should be avoided. If there's no way to avoid them, you should explain why in a comment.
In this case, why do we need it? According to the spawn_server docs:
"This function blocks until the spawned DBusMockObject is ready and listening on the bus."

387 + def reset_launcher(self):
392 + def reset_launcher_action(self):
398 + def factory_reset(self):
403 + def factory_reset_action(self):

We have found that we need to follow the page object pattern in order to make the tests maintainable and to be able to cope with design changes. That amongst other things mean that the UI components need to be hidden in objects that model their parents, and to be called from public methods that represent user actions.
It's explained in more detail here: http://developer.ubuntu.com/apps/platform/guides/acceptance-testing-using-the-page-object-model/
It would be awesome if you can read through it. I'm preparing a branch to show you what I mean. I'll ask for your review when it's ready.

Thanks for adding tests Jonas!

Revision history for this message

Leo Arias (elopio) on 2014-07-31:

review: Needs Fixing

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-31:

Oh, well, I won't be able to do the branch tonight because it's failing to build. So I'm not able to test my changes.

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-07-31:

Thank you for your comments. I think I have addressed all of them in r844.

The reset launcher functionality on the phone does not work, so putting it back in to WIP.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

FAILED: Continuous integration, rev:843
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2825/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4068/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2513/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1108/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1129/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1130/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-06:

Should the launcher reset restart the shell/device or at least tell they user that it's needed?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2014-08-06:

Me coming here from a unity8 POV -- personally, I'd like unity8 updated to notice when the setting changes to the default again, so it doesn't have to be restarted.

Failing that, we should probably tell the user to turn off and on their phone, but that's a very gross message to receive.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-06:

Ok, we should at least tell the user they need to do something.

review: Needs Fixing

lp:~jonas-drange/ubuntu-system-settings/1219793-reset updated on 2014-08-07

849. By Jonas G. Drange on 2014-08-07: merge trunk
850. By Jonas G. Drange on 2014-08-07: note up front re: restart

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-08-07:

Added note re: restart. Hopefully this will be handled by Unity at some point.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-07:

Please remove the debug output in reset.cpp and see inline comment.

lp:~jonas-drange/ubuntu-system-settings/1219793-reset updated on 2014-08-07

851. By Jonas G. Drange on 2014-08-07: removing hide-by-default and debug output

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-07:

Looks good, thanks!

review: Approve

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:

Jonas G. Drange

Ubuntu Touch System Settings

 === modified file 'plugins/reset/CMakeLists.txt'
 --- plugins/reset/CMakeLists.txt	2013-10-22 14:44:44 +0000
 +++ plugins/reset/CMakeLists.txt	2014-08-07 14:21:27 +0000
@@ -14,6 +14,8 @@
+ )
  qt5_use_modules(UbuntuResetPanel Qml Quick DBus)
++target_link_libraries(UbuntuResetPanel uss-accountsservice)
++
  set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Reset)
  install(TARGETS UbuntuResetPanel DESTINATION ${PLUG_DIR})
  install(FILES qmldir DESTINATION ${PLUG_DIR})
 === modified file 'plugins/reset/EntryComponent.qml'
 --- plugins/reset/EntryComponent.qml	2013-11-28 15:09:15 +0000
 +++ plugins/reset/EntryComponent.qml	2014-08-07 14:21:27 +0000
@@ -24,7 +24,7 @@
  ListItem.Standard {
      id: root
--
++    objectName: "entryComponent-reset"
      iconSource: model.icon
      iconFrame: false
      text: i18n.tr(model.displayName)
 === modified file 'plugins/reset/EraseEverything.qml'
 --- plugins/reset/EraseEverything.qml	2013-08-23 14:05:39 +0000
 +++ plugins/reset/EraseEverything.qml	2014-08-07 14:21:27 +0000
@@ -26,15 +26,33 @@
      id: eraseEverything
      Dialog {
          id: dialog
++        states: State {
++            name: "clicked"
++            PropertyChanges {
++                target: action
++                enabled: false
++            }
++            PropertyChanges {
++                target: cancel
++                enabled: false
++            }
++        }
++        objectName: "factoryResetDialog"
          text: i18n.tr("All documents, saved games, settings, and other items will be permanently deleted from this phone.")
          Button {
--            text: i18n.tr("Erase & reset everything")
--            enabled: false /* TODO: enable when there is a backend */
--            onClicked: PopupUtils.close(dialog)
++            id: action
++            text: i18n.tr("Erase & Reset Everything")
++            objectName: "factoryResetAction"
++            onClicked: {
++                dialog.state = "clicked";
++                resetBackend.factoryReset();
++                root.done();
++            }
+         }
          Button {
++            id: cancel
              text: i18n.tr("Cancel")
--            onClicked: PopupUtils.close(dialog)
++            onClicked: PopupUtils.close(dialog);
+         }
+     }
+ }
 === modified file 'plugins/reset/PageComponent.qml'
 --- plugins/reset/PageComponent.qml	2013-09-06 13:12:46 +0000
 +++ plugins/reset/PageComponent.qml	2014-08-07 14:21:27 +0000
@@ -30,8 +30,18 @@
      id: root
      title: i18n.tr("Reset phone")
++    objectName: "resetPage"
      flickable: scrollWidget
++    // workaround for #1231729
++    // delay destroying popup until pageStack has been popped
++    property var popup
++    function done () {
++        popup.opacity = 0;
++        pageStack.pop();
++        popup.destroy(1000);
++    }
++
      Loader {
          id: buttonActions
          asynchronous: false
@@ -59,24 +69,26 @@
              ListItem.SingleControl {
                  control: Button {
                      id: resetLauncherHomeButton
--                    text: i18n.tr("Reset launcher & home screen…")
++                    objectName: "resetLauncher"
++                    text: i18n.tr("Reset Launcher")
                      width: parent.width - units.gu(4)
                      onClicked: {
--                        buttonActions.source = "ResetLauncherHome.qml"
--                        PopupUtils.open(buttonActions.item)
++                        buttonActions.source = "ResetLauncherHome.qml";
++                        root.popup = PopupUtils.open(buttonActions.item);
+                     }
+                 }
                  showDivider: false
+             }
              ListItem.SingleControl {
++                visible: false // enabled when backend is ready/useful
                  control: Button {
                      id: resetAllSettingsButton
                      text: i18n.tr("Reset all system settings…")
                      width: parent.width - units.gu(4)
                      onClicked: {
--                        buttonActions.source = "ResetAllSettings.qml"
--                        PopupUtils.open(buttonActions.item)
++                        buttonActions.source = "ResetAllSettings.qml";
++                        root.popup = PopupUtils.open(buttonActions.item);
+                     }
+                 }
                  showDivider: false
@@ -85,11 +97,12 @@
              ListItem.SingleControl {
                  control: Button {
                      id: eraseEverythingButton
--                    text: i18n.tr("Erase & reset everything…")
++                    objectName: "factoryReset"
++                    text: i18n.tr("Erase & Reset Everything…")
                      width: parent.width - units.gu(4)
                      onClicked: {
--                        buttonActions.source = "EraseEverything.qml"
--                        PopupUtils.open(buttonActions.item)
++                        buttonActions.source = "EraseEverything.qml";
++                        root.popup = PopupUtils.open(buttonActions.item);
+                     }
+                 }
                  showDivider: false
 === modified file 'plugins/reset/ResetLauncherHome.qml'
 --- plugins/reset/ResetLauncherHome.qml	2013-09-06 13:12:46 +0000
 +++ plugins/reset/ResetLauncherHome.qml	2014-08-07 14:21:27 +0000
@@ -24,21 +24,42 @@
  Component {
      id: resetLauncherHome
--
      Dialog {
          id: dialog
--        text: i18n.tr("The contents and layout of the launcher, and the filters in the home screen will be returned to their original settings.")
++        states: State {
++            name: "clicked"
++            PropertyChanges {
++                target: action
++                enabled: false
++            }
++            PropertyChanges {
++                target: cancel
++                enabled: false
++            }
++        }
++        text: i18n.tr("The Launcher will be returned to its original contents.")
++        objectName: "resetLauncherDialog"
          Button {
--            text: i18n.tr("Reset launcher & home screen")
++            id: action
++            text: i18n.tr("Reset Launcher")
++            objectName: "resetLauncherAction"
              onClicked: {
--                unitySettings.schema.reset("favorites")
--                resetBackend.resetLauncher()
--                PopupUtils.close(dialog)
++                dialog.state = "clicked";
++                unitySettings.schema.reset("favorites");
++                resetBackend.resetLauncher();
++                root.done();
+             }
+         }
          Button {
++            id: cancel
              text: i18n.tr("Cancel")
              onClicked: PopupUtils.close(dialog)
+         }
++        Label {
++            text: i18n.tr("The phone needs to restart for changes to take effect.")
++            width: parent.width
++            wrapMode: Text.Wrap
++            horizontalAlignment: Text.AlignHCenter
++        }
+     }
+ }
 === modified file 'plugins/reset/reset.cpp'
 --- plugins/reset/reset.cpp	2013-09-06 13:12:46 +0000
 +++ plugins/reset/reset.cpp	2014-08-07 14:21:27 +0000
@@ -22,49 +22,55 @@
  #include <QEvent>
  #include <QDBusReply>
  #include <unistd.h>
--#include <QtCore/QDebug>
--
--Reset::Reset(QObject *parent) :
--    QObject(parent),
--    m_systemBusConnection (QDBusConnection::systemBus()),
--    m_accountsserviceIface ("org.freedesktop.Accounts",
--                            "/org/freedesktop/Accounts",
--                            "org.freedesktop.Accounts",
--                             m_systemBusConnection)
++#include <QDBusMetaType>
++
++typedef QList<QVariantMap> resetLauncherItemsArg;
++Q_DECLARE_METATYPE(resetLauncherItemsArg)
++
++Reset::Reset(QObject *parent)
++    : QObject(parent),
++    m_systemBusConnection(QDBusConnection::systemBus())
+ {
--    if (!m_accountsserviceIface.isValid()) {
--        return;
--    }
--
--    QDBusReply<QDBusObjectPath> qObjectPath = m_accountsserviceIface.call(
--                "FindUserById", qlonglong(getuid()));
--
--    if (qObjectPath.isValid()) {
--        m_objectPath = qObjectPath.value().path();
++    static bool isRegistered = false;
++    if(!isRegistered) {
++        qDBusRegisterMetaType<resetLauncherItemsArg>();
++        isRegistered = true;
+     }
+ }
  bool Reset::resetLauncher()
+ {
--    QDBusInterface userInterface (
--                "org.freedesktop.Accounts",
--                m_objectPath,
--                "org.freedesktop.DBus.Properties.Set",
--                m_systemBusConnection,
--                this);
--
--    if (!userInterface.isValid())
--        return false;
--
      QList<QVariantMap> items;
      QVariantMap defaults;
      defaults.insert("defaults", true);
      items << defaults;
--    /* TODO: test again-enable once the unity side lands
--        userInterface.call("Set",
--                       "com.canonical.unity.AccountsService",
--                       "launcher-items",
--                       QVariant::fromValue(items));*/
++    QVariant answer = m_accountsService.setUserProperty(
++                "com.canonical.unity.AccountsService",
++                "launcher-items",
++                QVariant::fromValue(items));
++
++    if (answer.isValid())
++        return true;
++
++    return false;
++}
++
++bool Reset::factoryReset()
++{
++    QDBusInterface systemServiceInterface (
++                "com.canonical.SystemImage",
++                "/Service",
++                "com.canonical.SystemImage",
++                m_systemBusConnection,
++                this);
++
++    if (!systemServiceInterface.isValid())
++        return false;
++
++    QDBusReply<QString> reply = systemServiceInterface.call("FactoryReset");
++    if (!reply.isValid())
++        return false;
++
      return true;
+ }
 === modified file 'plugins/reset/reset.h'
 --- plugins/reset/reset.h	2013-09-06 13:12:46 +0000
 +++ plugins/reset/reset.h	2014-08-07 14:21:27 +0000
@@ -21,7 +21,10 @@
  #ifndef RESET_H
  #define RESET_H
++#include "accountsservice.h"
++
  #include <QDBusInterface>
++#include <QDBusServiceWatcher>
  #include <QObject>
  #include <QProcess>
  #include <QUrl>
@@ -34,11 +37,11 @@
      explicit Reset(QObject *parent = 0);
      ~Reset();
      Q_INVOKABLE bool resetLauncher(void);
++    Q_INVOKABLE bool factoryReset(void);
  private:
++    AccountsService m_accountsService;
      QDBusConnection m_systemBusConnection;
--    QString m_objectPath;
--    QDBusInterface m_accountsserviceIface;
  };
  #endif // RESET_H
 === modified file 'plugins/reset/reset.settings'
 --- plugins/reset/reset.settings	2014-04-09 13:38:34 +0000
 +++ plugins/reset/reset.settings	2014-08-07 14:21:27 +0000
@@ -11,6 +11,5 @@
      "has-dynamic-keywords": false,
      "has-dynamic-visibility": false,
      "entry-component": "EntryComponent.qml",
--    "page-component": "PageComponent.qml",
--    "hide-by-default": true
++    "page-component": "PageComponent.qml"
+ }
 === modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/__init__.py	2014-07-22 18:29:46 +0000
 +++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-08-07 14:21:27 +0000
@@ -101,6 +101,10 @@
          item.swipe_into_view()
          self.pointing_device.click_object(item)
++    @autopilot.logging.log_action(logger.debug)
++    def go_to_reset_phone(self):
++        return self._go_to_page('entryComponent-reset', 'resetPage')
++
      def _go_to_page(self, item_object_name, page_object_name):
          self.click_item(item_object_name)
          page = self.wait_select_single(objectName=page_object_name)
@@ -108,7 +112,7 @@
          return page
      def scroll_to(self, obj):
--        page = self.select_single(objectName='systemSettingsPage')
++        page = self.system_settings_page
          page_right = page.globalRect[0] + page.globalRect[2]
          page_bottom = page.globalRect[1] + page.globalRect[3]
          page_center_x = int(page_right / 2)
@@ -128,6 +132,10 @@
          self.pointing_device.click_object(obj)
      @property
++    def system_settings_page(self):
++        return self.select_single(objectName='systemSettingsPage')
++
++    @property
      def cellular_page(self):
          """ Return 'Cellular' page """
          return self.select_single(objectName='cellularPage')
@@ -165,12 +173,25 @@
      @classmethod
      def validate_dbus_object(cls, path, state):
          name = introspection.get_classname_from_path(path)
--        if name == b'ItemPage':
++        if name == b'PageComponent':
              if state['objectName'][1] == 'cellularPage':
                  return True
          return False
++class TimeAndDatePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Sound page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'PageComponent':
++            if state['objectName'][1] == 'timeDatePage':
++                return True
++        return False
++
++
  class SoundPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
      """Autopilot helper for the Sound page."""
@@ -272,7 +293,101 @@
      @classmethod
      def validate_dbus_object(cls, path, state):
          name = introspection.get_classname_from_path(path)
--        if name == b'ItemPage':
++        if name == b'PageComponent':
              if state['objectName'][1] == 'systemUpdatesPage':
                  return True
          return False
++
++
++class ResetPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Reset page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'PageComponent':
++            if state['objectName'][1] == 'resetPage':
++                return True
++        return False
++
++    @autopilot.logging.log_action(logger.info)
++    def reset_launcher(self):
++        """Reset the launcher.
++
++        :returns: The main system settings page object, that will be visible
++            after the reset is complete.
++
++        """
++        confirm_dialog = self._click_reset_launcher()
++        confirm_dialog.confirm_reset()
++        return self._wait_and_return_main_system_settins_page()
++
++    @autopilot.logging.log_action(logger.debug)
++    def _click_reset_launcher(self):
++        button = self.select_single(objectName='resetLauncher')
++        self.pointing_device.click_object(button)
++        return self.get_root_instance().select_single(
++            objectName='resetLauncherDialog')
++
++    def _wait_and_return_main_system_settins_page(self):
++        main_view = self.get_root_instance().select_single(MainWindow)
++        main_view.system_settings_page.active.wait_for(True)
++        return main_view.system_settings_page
++
++    @autopilot.logging.log_action(logger.info)
++    def erase_and_reset_everything(self):
++        """Reset to factory settings.
++
++        :returns: The main system settings page object, that will be visible
++            after the reset is complete.
++
++        """
++        confirm_dialog = self._click_factory_reset()
++        confirm_dialog.confirm_reset()
++        return self._wait_and_return_main_system_settins_page()
++
++    @autopilot.logging.log_action(logger.debug)
++    def _click_factory_reset(self):
++        button = self.select_single(objectName='factoryReset')
++        self.pointing_device.click_object(button)
++        return self.get_root_instance().select_single(
++            objectName='factoryResetDialog')
++
++
++class ResetLauncherConfirmationDialog(
++        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Reset Launcher Confirmation dialog."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'Dialog':
++            if state['objectName'][1] == 'resetLauncherDialog':
++                return True
++        return False
++
++    @autopilot.logging.log_action(logger.debug)
++    def confirm_reset(self):
++        button = self.select_single('Button', objectName='resetLauncherAction')
++        self.pointing_device.click_object(button)
++
++
++class FactoryResetConfirmationDialog(
++        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Reset Launcher Confirmation dialog."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'Dialog':
++            if state['objectName'][1] == 'factoryResetDialog':
++                return True
++        return False
++
++    @autopilot.logging.log_action(logger.debug)
++    def confirm_reset(self):
++        button = self.select_single('Button', objectName='factoryResetAction')
++        self.pointing_device.click_object(button)
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-01 17:10:10 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-07 14:21:27 +0000
@@ -27,13 +27,15 @@
  ACCOUNTS_IFACE = 'org.freedesktop.Accounts'
  ACCOUNTS_USER_IFACE = 'org.freedesktop.Accounts.User'
  ACCOUNTS_OBJ = '/org/freedesktop/Accounts'
--
++ACCOUNTS_SERVICE = 'com.canonical.unity.AccountsService'
  ACCOUNTS_SOUND_IFACE = 'com.ubuntu.touch.AccountsService.Sound'
  MODEM_IFACE = 'org.ofono.Modem'
  CONNMAN_IFACE = 'org.ofono.ConnectionManager'
  RDO_IFACE = 'org.ofono.RadioSettings'
  SIM_IFACE = 'org.ofono.SimManager'
  NETREG_IFACE = 'org.ofono.NetworkRegistration'
++SYSTEM_IFACE = 'com.canonical.SystemImage'
++SYSTEM_SERVICE_OBJ = '/Service'
  class UbuntuSystemSettingsTestCase(
@@ -479,8 +481,7 @@
              'IncomingMessageVibrate': dbus.Boolean(False,
                                                     variant_level=1),
              'IncomingMessageVibrateSilentMode': dbus.Boolean(False,
--                                                             variant_level=1)
--            }
++                                                             variant_level=1)}
          # start dbus system bus
          self.mock_server = self.spawn_server(ACCOUNTS_IFACE, ACCOUNTS_OBJ,
@@ -555,3 +556,63 @@
          self.mock_server.terminate()
          self.mock_server.wait()
          super(SoundBaseTestCase, self).tearDown()
++
++
++class ResetBaseTestCase(UbuntuSystemSettingsTestCase,
++                        dbusmock.DBusTestCase):
++    """ Base class for reset settings tests"""
++
++    def mock_for_launcher_reset(self):
++        user_obj = '/user/foo'
++        # start dbus system bus
++        self.mock_server = self.spawn_server(ACCOUNTS_IFACE, ACCOUNTS_OBJ,
++                                             ACCOUNTS_IFACE, system_bus=True,
++                                             stdout=subprocess.PIPE)
++
++        # spawn_server does not wait properly
++        # Reported as bug here: http://pad.lv/1350833
++        sleep(2)
++        self.acc_proxy = dbus.Interface(self.dbus_con.get_object(
++            ACCOUNTS_IFACE, ACCOUNTS_OBJ), dbusmock.MOCK_IFACE)
++
++        self.acc_proxy.AddMethod(ACCOUNTS_IFACE, 'FindUserById', 'x', 'o',
++                                 'ret = "%s"' % user_obj)
++
++        self.acc_proxy.AddObject(
++            user_obj, ACCOUNTS_USER_IFACE, {}, [])
++
++        self.user_mock = dbus.Interface(self.dbus_con.get_object(
++            ACCOUNTS_IFACE, user_obj),
++            dbusmock.MOCK_IFACE)
++
++        self.user_mock.AddMethod(
++            'org.freedesktop.DBus.Properties', 'Set', 'ssaa{sv}', '', '')
++
++    def mock_for_factory_reset(self):
++        self.mock_server = self.spawn_server(SYSTEM_IFACE, SYSTEM_SERVICE_OBJ,
++                                             SYSTEM_IFACE, system_bus=True,
++                                             stdout=subprocess.PIPE)
++        # spawn_server does not wait properly
++        # Reported as bug here: http://pad.lv/1350833
++        sleep(2)
++        self.sys_mock = dbus.Interface(self.dbus_con.get_object(
++            SYSTEM_IFACE, SYSTEM_SERVICE_OBJ), dbusmock.MOCK_IFACE)
++
++        self.sys_mock.AddMethod(SYSTEM_IFACE, 'FactoryReset', '', '', '')
++
++    @classmethod
++    def setUpClass(klass):
++        klass.start_system_bus()
++        klass.dbus_con = klass.get_dbus(True)
++
++    def setUp(self):
++        self.mock_for_launcher_reset()
++        self.mock_for_factory_reset()
++
++        super(ResetBaseTestCase, self).setUp()
++        self.reset_page = self.system_settings.main_view.go_to_reset_phone()
++
++    def tearDown(self):
++        self.mock_server.terminate()
++        self.mock_server.wait()
++        super(ResetBaseTestCase, self).tearDown()
 === added file 'tests/autopilot/ubuntu_system_settings/tests/test_reset.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_reset.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-08-07 14:21:27 +0000
@@ -0,0 +1,50 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2014 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.
++
++from __future__ import absolute_import
++
++from time import sleep
++
++from autopilot.matchers import Eventually
++from gi.repository import Gio
++from testtools.matchers import Contains, Equals
++
++from ubuntu_system_settings.tests import ResetBaseTestCase
++from ubuntu_system_settings.utils.i18n import ugettext as _
++
++
++class ResetTestCase(ResetBaseTestCase):
++    """Tests for Reset Page"""
++
++    def set_unity_launcher_favorites(self, gsettings, favorites):
++        gsettings.set_value('favorites', favorites)
++        # wait for gsettings
++        sleep(1)
++
++    def test_reset_page_title_is_correct(self):
++        """Checks whether Reset page is available"""
++        self.assertThat(
++            self.reset_page.title,
++            Equals(_('Reset phone')))
++
++    def test_reset_launcher(self):
++        gsettings = Gio.Settings.new('com.canonical.Unity.Launcher')
++        favorites = gsettings.get_value('favorites')
++        self.addCleanup(
++            self.set_unity_launcher_favorites, gsettings, favorites)
++
++        self.reset_page.reset_launcher()
++
++        self.assertThat(
++            lambda: str(self.user_mock.GetCalls()),
++            Eventually(Contains('com.canonical.unity.AccountsService')))
++
++    def test_factory_reset(self):
++        self.reset_page.erase_and_reset_everything()
++        self.assertThat(
++            lambda: str(self.sys_mock.GetCalls()),
++            Eventually(Contains('FactoryReset')))