Merge lp:~nskaggs/reminders-app/finish-go-to-accounts into lp:reminders-app

[Nicholas Skaggs]

Trying to land https://code.launchpad.net/~elopio/reminders-app/test_go_to_accounts2/+merge/214163

Trying to land https://code.launchpad.net/~elopio/reminders-app/test_go_to_accounts2/+merge/214163

[Nicholas Skaggs (nskaggs)]

Trying to see if jenkins will still complain after rebasing to trunk.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:106
http://91.189.93.70:8080/job/reminders-app-ci/282/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2339/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/282
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/282

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/282/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/reminders-app/finish-go-to-accounts]

107. By Nicholas Skaggs on 2014-05-01

try switching to reminders_app

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:107
http://91.189.93.70:8080/job/reminders-app-ci/283/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2340/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/283/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/283/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/283/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/reminders-app/finish-go-to-accounts]

108. By Nicholas Skaggs on 2014-05-01

switch to reminders_app and try jenkins

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:108
http://91.189.93.70:8080/job/reminders-app-ci/284/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2341/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/284/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/284/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/reminders-app/finish-go-to-accounts]

109. By Nicholas Skaggs on 2014-05-01

revert back to reminders

110. By Nicholas Skaggs on 2014-05-01

revert python3 depends

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:110
http://91.189.93.70:8080/job/reminders-app-ci/285/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2344
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/285

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/285/rebuild

review: Approve (continuous-integration)

Unmerged revisions

110. By Nicholas Skaggs on 2014-05-01

revert python3 depends

109. By Nicholas Skaggs on 2014-05-01

revert back to reminders

108. By Nicholas Skaggs on 2014-05-01

switch to reminders_app and try jenkins

107. By Nicholas Skaggs on 2014-05-01

try switching to reminders_app

106. By Nicholas Skaggs on 2014-04-30

rebase to trunk

105. By Nicholas Skaggs on 2014-04-30

elopio's test account2

=== modified file 'debian/control'
--- debian/control	2014-04-04 06:15:42 +0000
+++ debian/control	2014-05-01 18:07:26 +0000
@@ -51,6 +51,9 @@
          reminders-app (= ${source:Version}),
          libautopilot-qt,
          libqt5test5,
+         python-dbus,
+         python-dbusmock,
+         python-fixtures,
          ubuntu-ui-toolkit-autopilot,
 Description: Test package for the Reminders app
  Autopilot tests for the Reminders app package
 
=== added file 'tests/autopilot/reminders/fake_services.py'
--- tests/autopilot/reminders/fake_services.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/reminders/fake_services.py	2014-05-01 18:07:26 +0000
@@ -0,0 +1,66 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This file is part of reminders
+#
+# reminders is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# reminders 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/>.
+
+import subprocess
+
+import dbus
+import dbusmock
+
+import reminders
+
+
+class FakeURLDispatcherService(object):
+    """Fake URL Dispatcher service using a dbusmock interface."""
+
+    def __init__(self):
+        super(FakeURLDispatcherService, self).__init__()
+        self.dbus_connection = dbusmock.DBusTestCase.get_dbus(system_bus=False)
+
+    def start(self):
+        """Start the fake URL Dispatcher service."""
+        # Stop the real url-dispatcher.
+        subprocess.call(['initctl', 'stop', 'url-dispatcher'])
+        self.dbus_mock_server = dbusmock.DBusTestCase.spawn_server(
+            'com.canonical.URLDispatcher',
+            '/com/canonical/URLDispatcher',
+            'com.canonical.URLDispatcher',
+            system_bus=False,
+            stdout=subprocess.PIPE)
+        self.mock = self._get_mock_interface()
+        self.mock.AddMethod(
+            'com.canonical.URLDispatcher', 'DispatchURL', 's', '', '')
+
+    def _get_mock_interface(self):
+        return dbus.Interface(
+            self.dbus_connection.get_object(
+                'com.canonical.URLDispatcher', '/com/canonical/URLDispatcher'),
+            dbusmock.MOCK_IFACE)
+
+    def stop(self):
+        """Stop the fake URL Dispatcher service."""
+        self.dbus_mock_server.terminate()
+        self.dbus_mock_server.wait()
+
+    def get_last_dispatch_url_call_parameter(self):
+        """Return the parameter used in the last call to dispatch URL."""
+        calls = self.mock.GetCalls()
+        if len(calls) == 0:
+            raise reminders.RemindersAppException(
+                'URL dispatcher has not been called.')
+        last_call = self.mock.GetCalls()[-1]
+        return last_call[2][0]
 
=== added file 'tests/autopilot/reminders/fixture_setup.py'
--- tests/autopilot/reminders/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/reminders/fixture_setup.py	2014-05-01 18:07:26 +0000
@@ -0,0 +1,34 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This file is part of reminders
+#
+# reminders is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# reminders 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/>.
+
+
+import fixtures
+
+from reminders import fake_services
+
+
+class FakeURLDispatcher(fixtures.Fixture):
+
+    def setUp(self):
+        super(FakeURLDispatcher, self).setUp()
+        self.fake_service = fake_services.FakeURLDispatcherService()
+        self.addCleanup(self.fake_service.stop)
+        self.fake_service.start()
+
+    def get_last_dispatch_url_call_parameter(self):
+        return self.fake_service.get_last_dispatch_url_call_parameter()
 
=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
--- tests/autopilot/reminders/tests/test_reminders.py	2014-04-04 06:14:54 +0000
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-05-01 18:07:26 +0000
@@ -18,10 +18,16 @@
 
 from __future__ import absolute_import
 
-from reminders import tests
-
 import logging
 
+from autopilot import platform
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+import reminders
+from reminders import fixture_setup, tests
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -30,3 +36,23 @@
     def test_open_application_without_account(self):
         """Test that the No account dialog is visible."""
         self.assertTrue(self.app.main_view.no_account_dialog.visible)
+
+    def test_go_to_account_settings(self):
+        """Test that the Go to account settings button calls url-dispatcher."""
+        if platform.model() == 'Desktop':
+             self.skipTest("URL dispatcher doesn't work on the desktop.")
+        url_dispatcher = fixture_setup.FakeURLDispatcher()
+        self.useFixture(url_dispatcher)
+
+        self.app.main_view.no_account_dialog.open_account_settings()
+
+        def get_last_dispatch_url_call_parameter():
+            # Workaround for http://pad.lv/1312384
+            try:
+                return url_dispatcher.get_last_dispatch_url_call_parameter()
+            except reminders.RemindersAppException:
+                return None
+
+        self.assertThat(
+            get_last_dispatch_url_call_parameter,
+            Eventually(Equals('settings:///system/online-accounts')))