Merge lp:~mikemc/ubuntuone-control-panel/set-default-folders into lp:ubuntuone-control-panel

[Mike McCracken]

- Set default folders to sync for first-run wizard on darwin (LP: #1067648)

- Set default folders to sync for first-run wizard on darwin (LP: #1067648)

[lp:~mikemc/ubuntuone-control-panel/set-default-folders]

372. By Mike McCracken on 2012-10-17

Use platform.expand_user to ensure that default folders are bytes. Add test for this.

[Roberto Alsina (ralsina)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'ubuntuone/controlpanel/utils/darwin.py'
--- ubuntuone/controlpanel/utils/darwin.py	2012-09-28 18:43:50 +0000
+++ ubuntuone/controlpanel/utils/darwin.py	2012-10-17 17:30:27 +0000
@@ -39,6 +39,7 @@
 
 from dirspec.basedir import save_config_path
 from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.platform import expand_user
 
 logger = setup_logging('utils.darwin')
 
@@ -352,8 +353,13 @@
 
 def default_folders(user_home=None):
     """Return a list of the folders to add by default."""
-    folders = []
-    # TODO
+    folders = ["~/Desktop",
+               "~/Downloads",
+               "~/Documents",
+               "~/Music",
+               "~/Pictures",
+               "~/Movies"]
+    folders = map(expand_user, folders)
     return folders
 
 

=== modified file 'ubuntuone/controlpanel/utils/tests/test_darwin.py'
--- ubuntuone/controlpanel/utils/tests/test_darwin.py	2012-09-28 18:43:50 +0000
+++ ubuntuone/controlpanel/utils/tests/test_darwin.py	2012-10-17 17:30:27 +0000
@@ -302,3 +302,27 @@
         self._patch_and_track(utils.darwin, to_track)
         auth_ref = utils.darwin.get_authorization()
         self.assertEqual(auth_ref, 'not void p')
+
+
+class DefaultFoldersTestCase(TestCase):
+    """Simple Test for default_folders."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up folders call."""
+        yield super(DefaultFoldersTestCase, self).setUp()
+        self.folders = utils.darwin.default_folders()
+
+    def test_default_folders_length(self):
+        """Test that we get some default folders."""
+        self.assertEqual(len(self.folders), 6)
+
+    def test_default_folders_expanded(self):
+        """Should expand paths."""
+        have_tilde = [n.startswith("~") for n in self.folders]
+        self.assertNotIn(True, have_tilde)
+
+    def test_default_folders_bytes(self):
+        """Paths should be bytes, not unicode."""
+        is_bytes = [type(n) == type(b'') for n in self.folders]
+        self.assertNotIn(False, is_bytes)