Merge lp:~ibelieve/ubuntu-filemanager-app/fix-autopilot-tests into lp:ubuntu-filemanager-app

[Michael Spencer]

Fixed broken autopilot tests that use the Places popover

Fixes broken autopilot tests caused by hacks to fix bugs in the UI toolkit caused by having a Suru theme.

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

FAILED: Continuous integration, rev:59
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/36/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/34

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/36/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:59
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/37/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/35
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/35

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/37/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/fix-autopilot-tests]

60. By Michael Spencer on 2013-08-15

Added check for desktop mode for open file autopilot test

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

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/38/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/36/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/39/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/39/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/36/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/fix-autopilot-tests]

61. By Michael Spencer on 2013-08-15

Fixed pep8 errors

[Nicholas Skaggs (nskaggs)]

working on my device, fixes the errors. +1

review: Approve

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

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/39/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'PlacesPopover.qml'
--- PlacesPopover.qml	2013-08-06 17:40:06 +0000
+++ PlacesPopover.qml	2013-08-15 22:09:11 +0000
@@ -124,6 +124,8 @@
             model: places
 
             delegate: Standard {
+			    property string name: folderName(path)
+            
                 Label {
                     anchors.left: parent.left
                     anchors.leftMargin: units.gu(8)

=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-08-13 21:46:44 +0000
+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-08-15 22:09:11 +0000
@@ -25,6 +25,7 @@
 import shutil
 
 from autopilot import process
+from autopilot.platform import model
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
@@ -136,37 +137,44 @@
         self.assertThat(
             list_view.get_current_path, Eventually(Equals(expected_path)))
 
-    def test_open_file(self):
-        self._make_file_in_home()
-
-        first_file = self._get_file_by_index(0)
-        self.pointing_device.click_object(first_file)
-
-        dialog = self.main_view.get_file_action_dialog()
-        dialog.visible.wait_for(True)
-
-        process_manager = process.ProcessManager.create()
-        original_apps = process_manager.get_running_applications()
-
-        dialog.open()
-        self.assertThat(
-            self.main_view.get_file_action_dialog, Eventually(Equals(None)))
-        # Filtering copied from
-        # AutopilotTestCase._compare_system_with_app_snapshot.
-        current_apps = self.process_manager.get_running_applications()
-        new_apps = filter(
-            lambda i: i not in original_apps, current_apps)
-        # Assert that only one window was opened.
-        self.assertEqual(len(new_apps), 1)
-        new_app = new_apps[0]
-        self.assertEqual(len(new_app.get_windows()), 1)
-
-        # TODO assert that the file was opened on the right application. This
-        # depends on what's the default application to open a text file. Maybe
-        # we can get this information with XDG. --elopio - 2013-07-25
-        # Close the opened window.
-        window = new_app.get_windows()[0]
-        window.close()
+    # We can't do this testcase on phablet devices because of a lack of
+    # Mir backend in autopilot
+    # see https://bugs.launchpad.net/autopilot/+bug/1209004
+    if model() == "Desktop":
+        def test_open_file(self):
+            self._make_file_in_home()
+
+            first_file = self._get_file_by_index(0)
+            self.pointing_device.click_object(first_file)
+
+            dialog = self.main_view.get_file_action_dialog()
+            dialog.visible.wait_for(True)
+
+            process_manager = process.ProcessManager.create()
+            original_apps = process_manager.get_running_applications()
+
+            dialog.open()
+            self.assertThat(
+                self.main_view.get_file_action_dialog,
+                Eventually(Equals(None)))
+            # Filtering copied from
+            # AutopilotTestCase._compare_system_with_app_snapshot.
+            current_apps = self.process_manager.get_running_applications()
+            new_apps = filter(
+                lambda i: i not in original_apps, current_apps)
+            # Assert that only one window was opened.
+            self.assertEqual(len(new_apps), 1)
+            new_app = new_apps[0]
+            self.assertEqual(len(new_app.get_windows()), 1)
+
+            # TODO assert that the file was opened on the right
+            # application. This depends on what's the default application
+            # to open a text file. Maybe we can get this information
+            # with XDG. --elopio - 2013-07-25
+
+            # Close the opened window.
+            window = new_app.get_windows()[0]
+            window.close()
 
     def test_open_directory(self):
         dir_path = self._make_directory_in_home()
@@ -559,7 +567,7 @@
         places_popover = self.main_view.get_places_popover()
         places = places_popover.select_many('Standard')
         for place in places:
-            if place.text == text:
+            if place.name == text:
                 return place
         raise ValueError(
             'Place "{0}" not found.'.format(text))

=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-08-06 17:40:06 +0000
+++ ubuntu-filemanager-app.qml	2013-08-15 22:09:11 +0000
@@ -32,7 +32,7 @@
     objectName: "filemanager"
     applicationName: "ubuntu-filemanager-app"
 
-    width: units.gu(100)
+    width: units.gu(50)
     height: units.gu(75)
 
     property alias filemanager: root