Merge lp:~elopio/ubuntu-filemanager-app/clean_context_menu_tests into lp:ubuntu-filemanager-app

[Leo Arias]

Refactored the first group of context menu tests.

I removed some clean ups unnecessary as we are working on a temp folder that will be deleted. I also removed the two tests that check the context popover is opened, because we are doing that check on open_actions.

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

PASSED: Continuous integration, rev:201
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/251/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/508
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/508/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/49

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:203
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/252/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/509
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/50

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:204
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/253/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/510
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/51

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

_copy_xauthority_file needs a little tweaking.. ~ is better expanded as os.environ.get('HOME'). I seem to remember a bug we found where this didn't expand properly.

Also, getting this error running on the device. Rebasing with trunk didn't seem to change anything;

17:09:09.133 ERROR testresult:46 - traceback: {{{
Traceback (most recent call last):
File "/home/phablet/autopilot/filemanager/tests/test_context_menu.py", line 41, in test_rename_directory
files_and_folders = self.get_current_directory_files_and_folders()
File "/home/phablet/autopilot/filemanager/tests/test_context_menu.py", line 27, in get_current_directory_files_and_folders
return folder_list_page.get_files_and_folders()
File "/home/phablet/autopilot/filemanager/emulators.py", line 216, in get_files_and_folders
raise NotImplementedError()
NotImplementedError
}}}

review: Needs Fixing

[Leo Arias (elopio)]

I'm sorry about the exception. It should be ready now.

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

PASSED: Continuous integration, rev:205
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/257/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/551
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/55

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

LGTM now..

Ran 22 tests in 491.443s
OK

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-05-06 17:57:59 +0000
+++ debian/control	2014-06-18 03:35:44 +0000
@@ -38,7 +38,7 @@
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Folder List model plugin of the Nemo QML 
+ This package contains the Folder List model plugin of the Nemo QML
  plugins collection.
 
 Package: ubuntu-filemanager-app-autopilot
@@ -49,5 +49,6 @@
          ubuntu-filemanager-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
          python3-autopilot,
+         python3-fixtures,
 Description: Autopilot tests for File Manager Application
  This package contains the autopilot tests for the File Manager

=== modified file 'tests/autopilot/filemanager/emulators.py'
--- tests/autopilot/filemanager/emulators.py	2014-06-10 18:01:42 +0000
+++ tests/autopilot/filemanager/emulators.py	2014-06-18 03:35:44 +0000
@@ -49,6 +49,12 @@
         side_bar = self.get_folder_list_page().get_sidebar()
         side_bar.go_to_place(object_name)
 
+    def get_folder_list_page(self):
+        """Return the FolderListPage emulator of the MainView."""
+        page = self.wait_select_single(FolderListPage)
+        page.main_view = self
+        return page
+
     def _go_to_place_from_popover(self, object_name):
         popover = self.open_places()
         place = popover.select_single('Standard', objectName=object_name)
@@ -70,11 +76,41 @@
         # --elopio - 2013-07-25
         return self.wait_select_single('Popover', objectName='placesPopover')
 
-    def get_folder_list_page(self):
-        """Return the FolderListPage emulator of the MainView."""
-        page = self.wait_select_single(FolderListPage)
-        page.main_view = self
-        return page
+    @autopilot.logging.log_action(logger.info)
+    def rename(self, original_name, new_name):
+        """Rename a file or directory.
+
+        :param original_name: The name of the file or directory to rename.
+        :param new_name: The new name to set for the file or directory.
+
+        """
+        actions_popover = self.open_actions(original_name)
+        actions_popover.click_button_by_text('Rename')
+        confirm_dialog = self.wait_select_single(ConfirmDialogWithInput)
+        confirm_dialog.enter_text(new_name)
+        confirm_dialog.ok()
+
+    @autopilot.logging.log_action(logger.info)
+    def open_actions(self, name):
+        """Open the list of available actions of a file or directory."""
+        folder_list_page = self.get_folder_list_page()
+        folder_list_page.open_file_actions(name)
+        actions_popover = self.get_action_selection_popover(
+            'fileActionsPopover')
+        actions_popover.visible.wait_for(True)
+        return actions_popover
+
+    @autopilot.logging.log_action(logger.info)
+    def delete(self, name):
+        """Delete a file or directory.
+
+        :param name: The name of the file or directory to delete.
+
+        """
+        actions_popover = self.open_actions(name)
+        actions_popover.click_button_by_text('Delete')
+        confirm_dialog = self.wait_select_single(ConfirmDialog)
+        confirm_dialog.ok()
 
     def get_file_actions_popover(self):
         """Return the ActionSelectionPopover emulator of the file actions."""
@@ -160,6 +196,27 @@
 class FolderListPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """FolderListPage Autopilot emulator."""
 
+    def open_file_actions(self, name):
+        """Open the actions menu of a file or folder.
+
+        :param name: The name of the file or folder.
+
+        """
+        delegate = self.get_file_by_name(name)
+        delegate.open_actions_popover()
+
+    def get_files_and_folders(self):
+        """Return the list of files and folders of the opened directory.
+
+        The list returned will contain the names of the files and folders.
+
+        """
+        if self.showingListView:
+            view = self.select_single(FolderListView)
+        else:
+            view = self.select_single(FolderIconView)
+        return view.get_files_and_folders()
+
     def get_number_of_files_from_list(self):
         """Return the number of files shown on the folder."""
         if self.showingListView:
@@ -252,6 +309,16 @@
         _, number_of_files = self._split_header_text()
         return int(number_of_files)
 
+    def get_files_and_folders(self):
+        """Return the list of files and folders of the opened directory."""
+        list_delegates = self.select_many(FolderListDelegate)
+        # sort by y, x
+        list_delegates = sorted(
+            list_delegates,
+            key=lambda item: (item.globalRect.y, item.globalRect.x))
+
+        return [item.fileName for item in list_delegates]
+
 
 class FolderIconView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """FolderListView Autopilot emulator."""
@@ -278,6 +345,16 @@
         _, number_of_files = self._split_header_text()
         return int(number_of_files)
 
+    def get_files_and_folders(self):
+        """Return the list of files and folders of the opened directory."""
+        icon_delegates = self.select_many(FolderIconDelegate)
+        # sort by y, x
+        icon_delegates = sorted(
+            icon_delegates,
+            key=lambda icon: (icon.globalRect.y, icon.globalRect.x))
+
+        return [icon.fileName for icon in icon_delegates]
+
 
 class FolderListDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """FolderListPage Autopilot emulator.
@@ -391,27 +468,12 @@
         self.keyboard = input.Keyboard.create()
 
     def enter_text(self, text, clear=True):
-        if clear:
-            self.clear_text()
-        text_field = self._select_text_field()
-        self.pointing_device.click_object(text_field)
-        self.keyboard.type(text)
-        text_field.text.wait_for(text)
-
-    def clear_text(self):
-        text_field = self._select_text_field()
-        # XXX The clear button doesn't have an objectName. Reported on
-        # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205208
-        # --elopio - 2013-07-25
-        clear_button = text_field.select_single('AbstractButton')
-        # XXX for some reason, we need to click the button twice.
-        # More investigation is needed. --elopio - 2013-07-25
-        self.pointing_device.click_object(clear_button)
-        self.pointing_device.click_object(clear_button)
-        text_field.text.wait_for('')
+        text_field = self._select_text_field()
+        text_field.write(text, clear)
 
     def _select_text_field(self):
-        return self.select_single('TextField', objectName='inputField')
+        return self.select_single(
+            toolkit_emulators.TextField, objectName='inputField')
 
 
 class Dialog(ConfirmDialogWithInput):

=== added file 'tests/autopilot/filemanager/fixture_setup.py'
--- tests/autopilot/filemanager/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/fixture_setup.py	2014-06-18 03:35:44 +0000
@@ -0,0 +1,78 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import os
+import shutil
+import tempfile
+
+import autopilot.logging
+import fixtures
+
+
+logger = logging.getLogger(__name__)
+
+
+class TemporaryFileInDirectory(fixtures.Fixture):
+    """Create a temporafy file in a specified directory."""
+
+    def __init__(self, parent_directory):
+        super(TemporaryFileInDirectory, self).__init__()
+        self.parent_directory = parent_directory
+
+    def setUp(self):
+        super(TemporaryFileInDirectory, self).setUp()
+        _, self.path = tempfile.mkstemp(
+            prefix='tmpfm', dir=self.parent_directory)
+        logger.debug(
+            'Created temporary file {} in {}.'.format(
+                self.path, self.parent_directory))
+        self.addCleanup(self.delete_file, self.path)
+
+    @autopilot.logging.log_action(logger.info)
+    def delete_file(self, path):
+        """Delete a file, if it exists."""
+        if os.path.exists(path):
+            logger.debug('Deleting file.')
+            os.remove(path)
+        else:
+            logger.debug('File does not exist.')
+
+
+class TemporaryDirectoryInDirectory(fixtures.Fixture):
+    """Create a temporary directory in a specified directory."""
+
+    def __init__(self, parent_directory):
+        super(TemporaryDirectoryInDirectory, self).__init__()
+        self.parent_directory = parent_directory
+
+    def setUp(self):
+        super(TemporaryDirectoryInDirectory, self).setUp()
+        self.path = tempfile.mkdtemp(
+            prefix='tmpfm', dir=self.parent_directory)
+        logger.debug(
+            'Created temporary directory {} in parent directory {}'.format(
+                self.path, self.parent_directory))
+        self.addCleanup(self.delete_directory, self.path)
+
+    @autopilot.logging.log_action(logger.info)
+    def delete_directory(self, path):
+        """Delete a directory, if it exists."""
+        if os.path.exists(path):
+            logger.debug('Deleting directory.')
+            shutil.rmtree(path)
+        else:
+            logger.debug('Directory does not exist.')

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2014-06-17 02:32:55 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2014-06-18 03:35:44 +0000
@@ -16,9 +16,9 @@
 
 """Filemanager app autopilot tests."""
 
+import logging
 import os
 import shutil
-import logging
 
 import fixtures
 from autopilot import logging as autopilot_logging
@@ -32,7 +32,7 @@
     fixture_setup as toolkit_fixtures
 )
 
-from filemanager import emulators
+from filemanager import emulators, fixture_setup
 
 logger = logging.getLogger(__name__)
 
@@ -52,7 +52,7 @@
     local_location_qml = os.path.join(local_location,
                                       'src/app/qml/filemanager.qml')
     local_location_binary = os.path.join(local_location, 'src/app/filemanager')
-    installed_location_qml = "/usr/share/filemanager/qml/filemanager.qml"
+    installed_location_qml = '/usr/share/filemanager/qml/filemanager.qml'
     installed_location_binary = '/usr/bin/filemanager'
 
     def get_launcher_and_type(self):
@@ -111,18 +111,16 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def _copy_xauthority_file(self, directory):
-        """ Copy .Xauthority file to directory, if it exists in /home
-        """
-        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
+        """Copy .Xauthority file to directory, if it exists in /home"""
+        xauth = os.path.join(os.environ.get('HOME'), '.Xauthority')
         if os.path.isfile(xauth):
             logger.debug("Copying .Xauthority to " + directory)
             shutil.copyfile(
-                os.path.expanduser(os.path.join('~', '.Xauthority')),
+                os.path.join(os.environ.get('HOME'), '.Xauthority'),
                 os.path.join(directory, '.Xauthority'))
 
     def _patch_home(self):
-        """ mock /home for testing purposes to preserve user data
-        """
+        """mock /home for testing purposes to preserve user data"""
         temp_dir_fixture = fixtures.TempDir()
         self.useFixture(temp_dir_fixture)
         temp_dir = temp_dir_fixture.path
@@ -142,10 +140,44 @@
             self.useFixture(fixtures.EnvironmentVariable('HOME',
                                                          newvalue=temp_dir))
 
-        logger.debug("Patched home to fake home directory " + temp_dir)
+        logger.debug('Patched home to fake home directory ' + temp_dir)
 
         return temp_dir
 
     @property
     def main_view(self):
         return self.app.wait_select_single(emulators.MainView)
+
+    def make_file_in_home(self):
+        return self.make_content_in_home('file')
+
+    def make_directory_in_home(self):
+        return self.make_content_in_home('directory')
+
+    def make_content_in_home(self, type_):
+        if type_ != 'file' and type_ != 'directory':
+            raise ValueError('Unknown content type: "{0}"', type_)
+        if type_ == 'file':
+            temp_file = fixture_setup.TemporaryFileInDirectory(self.home_dir)
+            self.useFixture(temp_file)
+            path = temp_file.path
+        else:
+            temp_dir = fixture_setup.TemporaryDirectoryInDirectory(
+                self.home_dir)
+            self.useFixture(temp_dir)
+            path = temp_dir.path
+        logger.debug('Directory Listing for HOME\n%s' %
+                     os.listdir(self.home_dir))
+        self._assert_number_of_files(1)
+        return path
+
+    def _assert_number_of_files(self, expected_number_of_files, home=True):
+        if home:
+            expected_number_of_files += self.original_file_count
+        folder_list_page = self.main_view.get_folder_list_page()
+        self.assertThat(
+            folder_list_page.get_number_of_files_from_list,
+            Eventually(Equals(expected_number_of_files), timeout=60))
+        self.assertThat(
+            folder_list_page.get_number_of_files_from_header,
+            Eventually(Equals(expected_number_of_files), timeout=60))

=== added file 'tests/autopilot/filemanager/tests/test_context_menu.py'
--- tests/autopilot/filemanager/tests/test_context_menu.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/tests/test_context_menu.py	2014-06-18 03:35:44 +0000
@@ -0,0 +1,83 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from filemanager import tests
+
+
+class ContextMenuTestCase(tests.FileManagerTestCase):
+    """Test cases for the context menu of the file manager app."""
+
+    def get_current_directory_files_and_folders(self):
+        folder_list_page = self.main_view.get_folder_list_page()
+        return folder_list_page.get_files_and_folders()
+
+    def test_rename_directory(self):
+        """Test renaming a directory.
+
+        The name of the directory must be updated on the list of folder
+        contents.
+
+        """
+        original_directory = os.path.basename(self.make_directory_in_home())
+        new_name = original_directory + 'edit'
+
+        self.main_view.rename(original_directory, new_name)
+
+        files_and_folders = self.get_current_directory_files_and_folders()
+        self.assertEquals(files_and_folders, [new_name])
+
+    def test_rename_file(self):
+        """Test renaming a file.
+
+        The name of the file must be updated on the list of folder contents.
+
+        """
+        original_file = os.path.basename(self.make_file_in_home())
+        new_name = original_file + 'edit'
+
+        self.main_view.rename(original_file, new_name)
+
+        files_and_folders = self.get_current_directory_files_and_folders()
+        self.assertEquals(files_and_folders, [new_name])
+
+    def test_delete_directory(self):
+        """Test deleting a directory.
+
+        The directory must no longer be displayed on the list of folder
+        contents.
+
+        """
+        dir_name = os.path.basename(self.make_directory_in_home())
+
+        self.main_view.delete(dir_name)
+
+        files_and_folders = self.get_current_directory_files_and_folders()
+        self.assertEquals(files_and_folders, [])
+
+    def test_delete_file(self):
+        """Test deleting a file.
+
+        The file must no longer be displayed ont he list of folder contents.
+
+        """
+        file_name = os.path.basename(self.make_file_in_home())
+
+        self.main_view.delete(file_name)
+
+        files_and_folders = self.get_current_directory_files_and_folders()
+        self.assertEquals(files_and_folders, [])

=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-06-10 02:34:07 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2014-06-18 03:35:44 +0000
@@ -16,12 +16,10 @@
 
 """File Manager app autopilot tests."""
 
-import tempfile
 import unittest
 import logging
 
 import os
-import shutil
 
 from autopilot import process
 from autopilot.platform import model
@@ -35,42 +33,6 @@
 
 class TestFolderListPage(FileManagerTestCase):
 
-    def _make_file_in_home(self):
-        return self._make_content_in_home('file')
-
-    def _make_content_in_home(self, type_):
-        if type_ != 'file' and type_ != 'directory':
-            raise ValueError('Unknown content type: "{0}"', type_)
-        if type_ == 'file':
-            _, path = tempfile.mkstemp(prefix='tmpfm',
-                                       dir=self.home_dir)
-            #path = self.home_dir + "/tmpfmFile"
-            #os.system("touch " + path)
-            logger.debug("Created %s, a file in HOME" % path)
-            self.addCleanup(self._unlink_cleanup, path)
-        else:
-            path = tempfile.mkdtemp(prefix='tmpfm', dir=self.home_dir)
-            #path = self.home_dir + "/tmpfmDir"
-            #os.system("mkdir " + path)
-            logger.debug("Created %s, a directory in HOME" % path)
-            self.addCleanup(self._rmdir_cleanup, path)
-
-        logger.debug("Directory Listing for HOME\n%s" %
-                     os.listdir(self.home_dir))
-        self._assert_number_of_files(1)
-        return path
-
-    def _assert_number_of_files(self, expected_number_of_files, home=True):
-        if home:
-            expected_number_of_files += self.original_file_count
-        folder_list_page = self.main_view.get_folder_list_page()
-        self.assertThat(
-            folder_list_page.get_number_of_files_from_list,
-            Eventually(Equals(expected_number_of_files), timeout=60))
-        self.assertThat(
-            folder_list_page.get_number_of_files_from_header,
-            Eventually(Equals(expected_number_of_files), timeout=60))
-
     def _get_file_by_name(self, name):
         folder_list_page = self.main_view.get_folder_list_page()
         fileDelegate = lambda: folder_list_page.get_file_by_name(name)
@@ -104,9 +66,6 @@
         goto_location.enter_text(location)
         goto_location.ok()
 
-    def _make_directory_in_home(self):
-        return self._make_content_in_home('directory')
-
     def _open_directory(self, item):
         expected_path = item.filePath
         list_view = item.list_view
@@ -155,24 +114,12 @@
             confirm_dialog.enter_text(text)
         confirm_dialog.ok()
 
-    def _unlink_cleanup(self, filename):
-        logger.debug("Cleanup; checking to remove %s file" % filename)
-        if os.path.exists(filename):
-            logger.debug("Removing %s file" % filename)
-            os.unlink(filename)
-
-    def _rmdir_cleanup(self, directory):
-        logger.debug("Cleanup; checking to remove %s directory" % directory)
-        if os.path.exists(directory):
-            logger.debug("Removing %s directory" % directory)
-            shutil.rmtree(directory)
-
     # 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
     @unittest.skip("Can't do this properly on desktop or phablet")
     def test_open_file(self):
-        self._make_file_in_home()
+        self.make_file_in_home()
 
         first_file = self._get_file_by_index(0)
         self.pointing_device.click_object(first_file)
@@ -205,23 +152,8 @@
         window = new_app.get_windows()[0]
         window.close()
 
-    def test_rename_directory(self):
-        orig_dir = os.path.basename(self._make_directory_in_home())
-        new_name = 'Renamed directory'
-        self.addCleanup(self._rmdir_cleanup,
-                        os.path.join(self.home_dir, new_name))
-
-        first_dir = self._get_file_by_name(orig_dir)
-        self._do_action_on_file(first_dir, action='Rename')
-        self._confirm_dialog(new_name)
-
-        self.assertThat(
-            self.main_view.confirm_dialog_exists, Eventually(Equals(False)))
-        self.assertThat(self._get_file_by_index(0).fileName,
-                        Eventually(Equals(new_name)))
-
     def test_open_directory(self):
-        dir_path = self._make_directory_in_home()
+        dir_path = self.make_directory_in_home()
         first_dir = self._get_file_by_name(os.path.basename(dir_path))
 
         self._open_directory(first_dir)
@@ -233,21 +165,10 @@
         # TODO check the label that says the directory is empty.
         # --elopio - 2013-07-25
 
-    def test_folder_context_menu_shows(self):
-        """Checks to make sure that the folder actions popover is shown."""
-        dir_path = os.path.basename(self._make_directory_in_home())
-
-        first_file = self._get_file_by_name(dir_path)
-        self._safe_open_popover(first_file.open_actions_popover)
-
-        file_actions_popover = self.main_view.get_file_actions_popover()
-        self.assertThat(
-            lambda: file_actions_popover.visible, Eventually(Equals(True)))
-
     def test_list_folder_contents(self):
-        dir_path = self._make_directory_in_home()
+        dir_path = self.make_directory_in_home()
         dir_name = os.path.basename(dir_path)
-        file_path = self._make_file_in_home()
+        file_path = self.make_file_in_home()
         file_name = os.path.basename(file_path)
 
         self._assert_number_of_files(2)
@@ -259,7 +180,7 @@
         self.assertThat(file_.fileName, Eventually(Equals(file_name)))
 
     def test_cancel_rename_directory(self):
-        dir_path = self._make_directory_in_home()
+        dir_path = self.make_directory_in_home()
         dir_name = os.path.basename(dir_path)
 
         first_dir = self._get_file_by_name(dir_name)
@@ -272,7 +193,7 @@
             lambda: first_dir.fileName, Eventually(Equals(dir_name)))
 
     def test_cancel_rename_file(self):
-        file_path = self._make_file_in_home()
+        file_path = self.make_file_in_home()
         file_name = os.path.basename(file_path)
 
         first_file = self._get_file_by_name(file_name)
@@ -285,22 +206,8 @@
             lambda: first_file.fileName,
             Eventually(Equals(file_name)))
 
-    def test_rename_file(self):
-        file_name = os.path.basename(self._make_file_in_home())
-        new_name = 'Renamed file'
-        self.addCleanup(self._unlink_cleanup, new_name)
-
-        first_file = self._get_file_by_name(file_name)
-        self._do_action_on_file(first_file, action='Rename')
-        self._confirm_dialog(new_name)
-
-        self.assertThat(
-            self.main_view.confirm_dialog_exists, Eventually(Equals(False)))
-        self.assertThat(self._get_file_by_index(0).fileName,
-                        Eventually(Equals(new_name)))
-
     def test_cancel_delete_directory(self):
-        dir_name = os.path.basename(self._make_directory_in_home())
+        dir_name = os.path.basename(self.make_directory_in_home())
         first_dir = self._get_file_by_name(dir_name)
 
         self._do_action_on_file(first_dir, 'Delete')
@@ -308,17 +215,8 @@
 
         self._assert_number_of_files(1)
 
-    def test_delete_directory(self):
-        dir_name = os.path.basename(self._make_directory_in_home())
-        first_dir = self._get_file_by_name(dir_name)
-
-        self._do_action_on_file(first_dir, 'Delete')
-        self._confirm_dialog()
-
-        self._assert_number_of_files(0)
-
     def test_cancel_delete_file(self):
-        file_name = os.path.basename(self._make_file_in_home())
+        file_name = os.path.basename(self.make_file_in_home())
         first_file = self._get_file_by_name(file_name)
 
         self._do_action_on_file(first_file, 'Delete')
@@ -326,19 +224,8 @@
 
         self._assert_number_of_files(1)
 
-    def test_delete_file(self):
-        file_name = os.path.basename(self._make_file_in_home())
-        first_file = self._get_file_by_name(file_name)
-
-        self._do_action_on_file(first_file, 'Delete')
-        self._confirm_dialog()
-
-        self._assert_number_of_files(0)
-
     def test_create_directory(self):
         dir_name = 'Test Directory'
-        self.addCleanup(self._rmdir_cleanup,
-                        os.path.join(self.home_dir, dir_name))
 
         open_popover = lambda: \
             self.main_view.open_toolbar().click_button('actions')
@@ -365,7 +252,7 @@
         self._assert_number_of_files(0)
 
     def test_show_directory_properties_from_list(self):
-        dir_path = self._make_directory_in_home()
+        dir_path = self.make_directory_in_home()
         dir_name = os.path.basename(dir_path)
         first_dir = self._get_file_by_name(dir_name)
 
@@ -379,7 +266,7 @@
         # --elopio - 2013-07-25
 
     def test_show_file_properties(self):
-        file_path = self._make_file_in_home()
+        file_path = self.make_file_in_home()
         file_name = os.path.basename(file_path)
         first_file = self._get_file_by_name(file_name)
 
@@ -396,11 +283,9 @@
                                             'destination')
         destination_dir_name = os.path.basename(destination_dir_path)
         os.mkdir(destination_dir_path)
-        self.addCleanup(self._rmdir_cleanup, destination_dir_path)
         dir_to_copy_path = os.path.join(self.home_dir, 'to_copy')
         dir_to_copy_name = os.path.basename(dir_to_copy_path)
         os.mkdir(dir_to_copy_path)
-        self.addCleanup(self._rmdir_cleanup, dir_to_copy_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
         self._assert_number_of_files(2)
@@ -444,11 +329,9 @@
                                             'destination')
         destination_dir_name = os.path.basename(destination_dir_path)
         os.mkdir(destination_dir_path)
-        self.addCleanup(self._rmdir_cleanup, destination_dir_path)
         dir_to_cut_path = os.path.join(self.home_dir, 'to_cut')
         dir_to_cut_name = os.path.basename(dir_to_cut_path)
         os.mkdir(dir_to_cut_path)
-        self.addCleanup(self._rmdir_cleanup, dir_to_cut_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
         self._assert_number_of_files(2)
@@ -491,9 +374,9 @@
 
     def test_copy_file(self):
         # Set up a file to copy and a directory to copy it into.
-        destination_dir_path = self._make_directory_in_home()
+        destination_dir_path = self.make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        file_to_copy_path = self._make_file_in_home()
+        file_to_copy_path = self.make_file_in_home()
         file_to_copy_name = os.path.basename(file_to_copy_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
@@ -538,9 +421,9 @@
 
     def test_cut_file(self):
         # Set up a file to cut and a directory to move it into.
-        destination_dir_path = self._make_directory_in_home()
+        destination_dir_path = self.make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        file_to_cut_path = self._make_file_in_home()
+        file_to_cut_path = self.make_file_in_home()
         file_to_cut_name = os.path.basename(file_to_cut_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
@@ -583,7 +466,7 @@
             first_dir.fileName, Eventually(Equals(destination_dir_name)))
 
     def test_go_up(self):
-        dir_name = os.path.basename(self._make_directory_in_home())
+        dir_name = os.path.basename(self.make_directory_in_home())
         first_dir = self._get_file_by_name(dir_name)
         self._open_directory(first_dir)
 
@@ -594,14 +477,3 @@
         self.assertThat(
             folder_list_page.get_current_path,
             Eventually(Equals(self.home_dir)))
-
-    def test_file_context_menu_shows(self):
-        """Checks to make sure that the file actions popover is shown."""
-        file_name = os.path.basename(self._make_file_in_home())
-
-        first_file = self._get_file_by_name(file_name)
-        self._safe_open_popover(first_file.open_actions_popover)
-
-        file_actions_popover = self.main_view.get_file_actions_popover()
-        self.assertThat(
-            lambda: file_actions_popover.visible, Eventually(Equals(True)))