Merge lp:~elopio/unity-scope-click/install_without_account into lp:unity-scope-click

[Leo Arias]

Added a test to try to install without credentials.

[lp:~elopio/unity-scope-click/install_without_account]

114. By Leo Arias on 2014-01-23

Refactor.

[Leo Arias (elopio)]

For this branch, we assume online accounts doesn't have U1 credentials. On the next one, I'm adding credentials creation and deletion.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/189/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/190/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'src/tests/autopilot/unityclickscope/fake_servers.py'
--- src/tests/autopilot/unityclickscope/fake_servers.py	2014-01-14 19:57:00 +0000
+++ src/tests/autopilot/unityclickscope/fake_servers.py	2014-01-23 02:35:29 +0000
@@ -42,10 +42,10 @@
     ]
     _FAKE_SHORTS_DETAILS_DICT = {
         'website': 'https://launchpad.net/ubuntu-rssreader-app',
-        'description':
+        'description': (
             'Shorts is an rssreader application\n'
             'Shorts is an rss reader application that allows you to easily '
-            'search for new feeds.',
+            'search for new feeds.'),
         'price': 0.0,
         'framework': ["ubuntu-sdk-13.10"],
         'terms_of_service': '',
@@ -72,6 +72,9 @@
         ],
         'architecture': ['all']
     }
+    _FAKE_DETAILS = {
+        'com.ubuntu.shorts': _FAKE_SHORTS_DETAILS_DICT
+    }
 
     def do_GET(self):
         parsed_path = urlparse.urlparse(self.path)
@@ -107,8 +110,9 @@
             self.wfile.write(data)
 
     def send_package_details(self, package):
-        if package == 'com.ubuntu.shorts':
+        details = self._FAKE_DETAILS.get(package, None)
+        if details is not None:
             self.send_json_reply(
-                200, json.dumps(self._FAKE_SHORTS_DETAILS_DICT))
+                200, json.dumps(details))
         else:
             raise NotImplementedError(package)
 
=== modified file 'src/tests/autopilot/unityclickscope/test_click_scope.py'
--- src/tests/autopilot/unityclickscope/test_click_scope.py	2014-01-14 20:10:12 +0000
+++ src/tests/autopilot/unityclickscope/test_click_scope.py	2014-01-23 02:35:29 +0000
@@ -117,21 +117,52 @@
         icon = self.scope.wait_select_single('Tile', text=name)
         pointing_device = toolkit_emulators.get_pointing_device()
         pointing_device.click_object(icon)
-        return self.dash.wait_select_single(AppPreview)
-
-
-# TODO move this to unity. --elopio - 2014-1-14
-class AppPreview(unity_emulators.UnityEmulatorBase):
-    """Autopilot emulator for the application preview."""
+        preview = self.dash.wait_select_single(AppPreview)
+        preview.showProcessingAction.wait_for(False)
+        return preview
+
+    def test_install_without_credentials(self):
+        preview = self._open_app_preview('Shorts')
+        preview.install()
+        error = self.dash.wait_select_single(DashPreview)
+        details = error.get_details()
+        self.assertEqual('Login Error', details.get('title'))
+
+
+class Preview(object):
 
     def get_details(self):
-        """Return the details of the application whose preview is open."""
+        """Return the details of the open preview."""
         title = self.select_single('Label', objectName='titleLabel').text
-        publisher = self.select_single(
+        subtitle = self.select_single(
             'Label', objectName='subtitleLabel').text
         # The description label doesn't have an object name. Reported as bug
         # http://pad.lv/1269114 -- elopio - 2014-1-14
         # description = self.select_single(
         #    'Label', objectName='descriptionLabel').text
         # TODO check screenshots, icon, rating and reviews.
-        return dict(title=title, publisher=publisher)
+        return dict(title=title, subtitle=subtitle)
+
+
+# TODO move this to unity. --elopio - 2014-1-22
+class DashPreview(unity_emulators.UnityEmulatorBase, Preview):
+    """Autopilot emulator for the generic preview."""
+
+
+# TODO move this to unity. --elopio - 2014-1-14
+class AppPreview(unity_emulators.UnityEmulatorBase, Preview):
+    """Autopilot emulator for the application preview."""
+
+    def get_details(self):
+        """Return the details of the application whose preview is open."""
+        details = super(AppPreview, self).get_details()
+        return dict(
+            title=details.get('title'), publisher=details.get('subtitle'))
+
+    def install(self):
+        install_button = self.select_single('Button', objectName='button0')
+        if install_button.text != 'Install':
+            raise unity_emulators.UnityEmulatorException(
+                'Install button not found.')
+        self.pointing_device.click_object(install_button)
+        self.wait_until_destroyed()