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

[Michael Spencer]

Added more autopilot tests

Added more autopilot tests.

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

FAILED: Continuous integration, rev:48
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/5/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/3/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/3/console

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

review: Needs Fixing (continuous-integration)

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

49. By Michael Spencer on 2013-07-16

Fixed pep8 errors

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

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/6/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/7/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/7/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/4/console

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

review: Needs Fixing (continuous-integration)

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

50. By Michael Spencer on 2013-07-16

Fixed pyflake errors

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

PASSED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/5
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/5

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I think this closes out the remaining bugs, awesome work Michael!

I added this bug as it appears to be fixed in this commit also:
https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1188746

review: Approve

[Michael Spencer (ibelieve)]

That bug is the one that I am stuck on that throws DBus exceptions. The only thing I have in the branch related to that is the pseudo code for that test.

=== modified file 'ConfirmDialog.qml'
--- ConfirmDialog.qml	2013-07-04 20:33:07 +0000
+++ ConfirmDialog.qml	2013-07-16 01:09:24 +0000
@@ -26,6 +26,7 @@
     signal rejected
 
     Button {
+        id: okButton
         objectName: "okButton"
         text: i18n.tr("Ok")
         onClicked: {
@@ -35,6 +36,7 @@
     }
 
     Button {
+        id: cancelButton
         objectName: "cancelButton"
         text: i18n.tr("Cancel")
 

=== modified file 'FileActionDialog.qml'
--- FileActionDialog.qml	2013-05-16 16:14:35 +0000
+++ FileActionDialog.qml	2013-07-16 01:09:24 +0000
@@ -28,9 +28,10 @@
     property FolderListModel folderListModel
 
     title: i18n.tr("Choose action")
-    text: i18n.tr("For file: ") + fileName
+    text: i18n.tr("For file: %1").arg(fileName)
 
     Button {
+        objectName: "openButton"
         text: i18n.tr("Open")
         onClicked: {
             console.log("Opening file", filePath)
@@ -40,7 +41,20 @@
     }
 
     Button {
+        objectName: "cancelButton"
         text: i18n.tr("Cancel")
         onClicked: PopupUtils.close(root)
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
     }
 }

=== modified file 'FileDetailsPopover.qml'
--- FileDetailsPopover.qml	2013-07-08 12:46:19 +0000
+++ FileDetailsPopover.qml	2013-07-16 01:09:24 +0000
@@ -91,6 +91,7 @@
             }
 
             Label {
+                objectName: "pathLabel"
                 text: root.path
             }
 

=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-06-30 02:06:29 +0000
+++ FolderListView.qml	2013-07-16 01:09:24 +0000
@@ -195,7 +195,7 @@
                                     fileName: model.fileName,
                                     filePath: model.filePath,
                                     folderListModel: root.folderListModel
-                                 })
+                                })
             }
         }
 

=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-07-15 16:38:00 +0000
+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-07-16 01:09:24 +0000
@@ -18,6 +18,7 @@
 
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
+#from testtools.matchers import NotEquals
 
 from ubuntu_filemanager_app.tests import FileManagerTestCase
 
@@ -47,7 +48,7 @@
             if place.text == name:
                 return place
 
-    def test_file_actions_shows(self):
+    def test_file_context_menu_shows(self):
         """Checks to make sure that the file actions popover is shown."""
         self._make_file_in_home()
 
@@ -57,7 +58,7 @@
         action_popover = self.main_window.get_action_popover()
         self.assertThat(lambda: action_popover.opacity, Eventually(Equals(1)))
 
-    def test_folder_actions_shows(self):
+    def test_folder_context_menu_shows(self):
         """Checks to make sure that the folder actions popover is shown."""
         self._make_directory_in_home()
 
@@ -67,28 +68,63 @@
         action_popover = self.main_window.get_action_popover()
         self.assertThat(lambda: action_popover.opacity, Eventually(Equals(1)))
 
+    def test_list_folder_contents(self):
+        sub_dir = self._make_directory_in_home()
+        fileName = self._make_file_in_home()
+
+        first_folder = self.main_window.get_file_item(0)
+        self.assertThat(first_folder.fileName,
+                        Eventually(Equals(os.path.split(sub_dir)[1])))
+
+        first_file = self.main_window.get_file_item(1)
+        self.assertThat(first_file.fileName,
+                        Eventually(Equals(os.path.split(fileName)[1])))
+
     def _make_directory_in_home(self):
+        count = self.main_window.get_file_count()
         path = tempfile.mkdtemp(dir=os.environ['HOME'])
-        # Currently, we need to open again the home folder to show the newly
-        # created one. See bug #1190676.
-        # TODO when the bug is fixed, remove the following line
-        self._go_to_place('Home')
 
-        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+        self.assertThat(self.main_window.get_file_count,
+                        Eventually(Equals(count + 1)))
 
         return path
 
     def _make_file_in_home(self):
+        count = self.main_window.get_file_count()
         path = tempfile.mkstemp(dir=os.environ['HOME'])[1]
-        # Currently, we need to open again the home folder to show the newly
-        # created one. See bug #1190676.
-        # TODO when the bug is fixed, remove the following line
-        self._go_to_place('Home')
 
-        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+        self.assertThat(self.main_window.get_file_count,
+                        Eventually(Equals(count + 1)))
 
         return path
 
+    def test_file_action_dialog(self):
+        file_name = self._make_file_in_home()
+
+        first_file = self.main_window.get_file_item(0)
+        self.assertThat(first_file.fileName,
+                        Eventually(Equals(os.path.split(file_name)[1])))
+
+        self.pointing_device.click_object(first_file)
+
+        dialog = self.app.select_single('FileActionDialog')
+        cancelButton = dialog.select_single(
+            'Button',
+            objectName='cancelButton')
+        self.pointing_device.click_object(cancelButton)
+
+        first_file = self.main_window.get_file_item(0)
+        self.assertThat(first_file.fileName,
+                        Eventually(Equals(os.path.split(file_name)[1])))
+
+        self.pointing_device.click_object(first_file)
+
+        dialog = self.app.select_single('FileActionDialog')
+
+        openButton = dialog.select_single(
+            'Button', objectName='openButton')
+        self.pointing_device.click_object(openButton)
+
     def test_open_directory(self):
         sub_dir = self._make_directory_in_home()
 
@@ -200,12 +236,7 @@
     def test_create_directory(self):
         name = 'Test Directory'
 
-        #self._go_to_place('Home')
-        self.ubuntusdk.click_toolbar_button('Actions')
-
-        popover = self.app.select_single(
-            "ActionSelectionPopover", objectName='folderActionsPopover')
-        self._run_action(popover, 'Create New Folder')
+        self._run_folder_action('Create New Folder')
         self._provide_input(name)
 
         self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
@@ -214,6 +245,178 @@
             lambda: self.main_window.get_filenames()[0], Eventually(
                 Equals(name)))
 
+    def test_showing_directory_properties(self):
+        path = self._make_directory_in_home()
+
+        first_folder = self.main_window.get_file_item(0)
+        self.tap_item(first_folder)
+
+        popover = self.main_window.get_action_popover()
+        self._run_action(popover, 'Properties')
+
+        properties_popover = self.app.select_single('FileDetailsPopover')
+        self.assertThat(lambda: properties_popover.opacity,
+                        Eventually(Equals(1)))
+        path_label = properties_popover.select_single(
+            'Label', objectName='pathLabel')
+        self.assertThat(lambda: path_label.text,
+                        Eventually(Equals(path)))
+
+    def test_showing_file_properties(self):
+        path = self._make_file_in_home()
+
+        first_file = self.main_window.get_file_item(0)
+        self.tap_item(first_file)
+
+        popover = self.app.select_single(
+            "ActionSelectionPopover", objectName='fileActionsPopover')
+        self._run_action(popover, 'Properties')
+
+        properties_popover = self.app.select_single(
+            'FileDetailsPopover')
+        self.assertThat(lambda: properties_popover.opacity,
+                        Eventually(Equals(1)))
+        path_label = properties_popover.select_single(
+            'Label', objectName='pathLabel')
+        self.assertThat(lambda: path_label.text, Eventually(Equals(path)))
+
+    def test_copy_folder(self):
+        # Set up a folder to copy and a folder to copy it into
+        sub_dir = os.environ['HOME'] + '/Destination'
+        os.mkdir(sub_dir)
+        copy_dir = os.environ['HOME'] + '/Folder to Copy'
+        os.mkdir(copy_dir)
+
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(2)))
+
+        # Copy the folder
+        first_file = self.main_window.get_file_item(1)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(copy_dir)[1])))
+        self._run_file_action(first_file, 'Copy')
+
+        # Go to the destination folder
+        first_folder = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_folder.fileName,
+            Eventually(Equals(os.path.split(sub_dir)[1])))
+
+        self.pointing_device.click_object(first_folder)
+
+        # Paste it in
+        self._run_folder_action('Paste 1 File')
+
+        # Check that the folder is there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+        first_file = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(copy_dir)[1])))
+
+        # Go back
+        self._go_up()
+
+        # Check that the file is still there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(2)))
+        first_file = self.main_window.get_file_item(1)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(copy_dir)[1])))
+
+    def test_cut_folder(self):
+        # Set up a folder to cut and a folder to move it into
+        sub_dir = os.environ['HOME'] + '/Destination'
+        os.mkdir(sub_dir)
+        copy_dir = os.environ['HOME'] + '/Folder to Cut'
+        os.mkdir(copy_dir)
+
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(2)))
+
+        # Cut the folder
+        first_file = self.main_window.get_file_item(1)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(copy_dir)[1])))
+        self._run_file_action(first_file, 'Cut')
+
+        # Go to the destination folder
+        first_folder = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_folder.fileName,
+            Eventually(Equals(os.path.split(sub_dir)[1])))
+
+        self.pointing_device.click_object(first_folder)
+
+        # Paste it in
+        self._run_folder_action('Paste 1 File')
+
+        # Check that the folder is there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+        first_file = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(copy_dir)[1])))
+
+        # Go back
+        self._go_up()
+
+        # Check that the folder is not there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+
+    def test_copy_file(self):
+        pass
+        # Set up a file to copy and a folder to copy it into
+        # Copy the file
+        # Go to the destination folder
+        # Paste it in
+        # Check that the file is there
+        # Go back
+        # Check that the folder is not there
+
+    def test_cut_file(self):
+        # Set up a file to cut and a folder to copy it into
+        sub_dir = self._make_directory_in_home()
+        fileName = self._make_file_in_home()
+
+        # Cut the file
+        first_file = self.main_window.get_file_item(1)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(fileName)[1])))
+        self.tap_item(first_file)
+
+        popover = self.app.select_single(
+            "ActionSelectionPopover", objectName='fileActionsPopover')
+        self._run_action(popover, 'Cut')
+
+        # Go to the folder
+        first_folder = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_folder.fileName,
+            Eventually(Equals(os.path.split(sub_dir)[1])))
+
+        self.pointing_device.click_object(first_folder)
+
+        # Paste it in
+        self._run_folder_action('Paste 1 File')
+
+        # Check that the file is there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+        first_file = self.main_window.get_file_item(0)
+        self.assertThat(
+            first_file.fileName,
+            Eventually(Equals(os.path.split(fileName)[1])))
+
+        # Go back
+        self._go_up()
+
+        # Check that the file is not there
+        self.assertThat(self.main_window.get_file_count, Eventually(Equals(1)))
+
+    def _go_up(self):
+        self.ubuntusdk.click_toolbar_button('Up')
+
     def test_going_up(self):
         upDir = os.path.split(os.environ['HOME'])[0]
         upName = os.path.split(upDir)[1]
@@ -247,6 +450,19 @@
             self.main_window.get_current_folder_name,
             Eventually(Equals(location)))
 
+    def _run_file_action(self, item, name):
+        self.tap_item(item)
+
+        popover = self.app.select_single(
+            "ActionSelectionPopover", objectName='fileActionsPopover')
+        self._run_action(popover, name)
+
+    def _run_folder_action(self, name):
+        self.ubuntusdk.click_toolbar_button('Actions')
+        popover = self.app.select_single(
+            "ActionSelectionPopover", objectName='folderActionsPopover')
+        self._run_action(popover, name)
+
     def _run_action(self, popover, name):
         actions = popover.select_many('Empty')
         requested = None