Merge lp:~ralsina/ubuntuone-control-panel/space-the-final-frontier into lp:ubuntuone-control-panel

[Roberto Alsina]

- Made handling of the space key more robust in the search field (LP:1042806)

Be a bit more robust when theuser presses space in the search box in the file share tab.

This is hard to reproduce, it happens to me because of bug #1042885

[lp:~ralsina/ubuntuone-control-panel/space-the-final-frontier]

356. By Roberto Alsina on 2012-08-28

simpler test

357. By Roberto Alsina on 2012-08-28

typos

[Manuel de la Peña (mandel)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-08-27 20:02:55 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-08-28 18:40:24 +0000
@@ -131,6 +131,8 @@
     def _key_space_pressed(self):
         """The user pressed the space key."""
         item = self.popup.list_widget.currentItem()
+        if item is None:
+            return False
         widget = self.popup.list_widget.itemWidget(item)
         self.setText(widget.name)
         self.popup.hide()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-08-28 18:40:24 +0000
@@ -67,7 +67,7 @@
         self.assertEqual(self.ui.prefix, '')
 
     def test_key_down_pressed(self):
-        """Check the proper action are executed on key down pressed."""
+        """Check the proper actions are executed on key down pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -77,7 +77,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 2)
 
     def test_key_down_pressed_load_more_items(self):
-        """Check the proper action are executed on key down pressed."""
+        """Check the proper actions are executed on key down pressed."""
         data = []
 
         def fake_fetch_more(filenames):
@@ -99,7 +99,7 @@
         self.assertEqual(data, [True])
 
     def test_key_up_pressed(self):
-        """Check the proper action are executed on key up pressed."""
+        """Check the proper actions are executed on key up pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -109,7 +109,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 0)
 
     def test_key_up_pressed_stay_in_0(self):
-        """Check the proper action are executed on key up pressed."""
+        """Check the proper actions are executed on key up pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -120,7 +120,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 0)
 
     def test_key_return_pressed(self):
-        """Check the proper action are executed on key return pressed."""
+        """Check the proper actions are executed on key return pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -129,7 +129,7 @@
         self.ui._key_return_pressed(current)
 
     def test_key_space_pressed(self):
-        """Check the proper action are executed on key space pressed."""
+        """Check the proper actions are executed on key space pressed."""
         data = []
 
         def fake_set_text(text):
@@ -146,6 +146,11 @@
         expected = ['iop']
         self.assertEqual(expected, data)
 
+    def test_key_space_pressed_without_selection(self):
+        """Check the proper actions are executed on key space pressed."""
+        self.ui.popup.list_widget.setCurrentItem(None)
+        self.assertFalse(self.ui._key_space_pressed())
+
     def test_process_volumes_info(self):
         """Check that _process_volumes_info obtain the proper info."""
         data1 = [{'path': 'folder1'}]