Merge lp:~nataliabidart/ubuntuone-control-panel/confirm-before-delete into lp:ubuntuone-control-panel

[Natalia Bidart]

- When removing a device, a confirmation dialog is raised (LP: #706888).

[Roman Yepishev (rye)]

Control Panel has asked me whether I want to remove the device. I just could not say no!

review: Approve (fieldtest)

[lp:~nataliabidart/ubuntuone-control-panel/confirm-before-delete]

54. By Natalia Bidart on 2011-01-25

Spacing to devices.

[Roman Yepishev (rye)]

To clarify possible confusion about my review here's a true and non-joking summary:
I ran this branch, i clicked on delete. If I confirm the removal then device gets removed. If I decline the removal then device is not removed. Result: Approve during fieldtest.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'data/device.ui'
--- data/device.ui	2011-01-24 13:40:10 +0000
+++ data/device.ui	2011-01-25 12:57:15 +0000
@@ -12,65 +12,53 @@
   </object>
   <object class="GtkVBox" id="itself">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="border_width">10</property>
     <property name="spacing">5</property>
     <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">15</property>
+        <property name="spacing">10</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkImage" id="device_type">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">computer</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="device_name">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="xpad">5</property>
                     <property name="label">My Laptop</property>
                     <property name="wrap">True</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="left_padding">25</property>
                 <child>
                   <object class="GtkTable" id="throttling">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">3</property>
@@ -81,15 +69,13 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_limit_bandwidth_toggled" swapped="no"/>
+                        <signal name="toggled" handler="on_limit_bandwidth_toggled"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="max_upload_speed_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">Max upload speed (KiB/s)</property>
@@ -103,7 +89,6 @@
                     <child>
                       <object class="GtkLabel" id="max_download_speed_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">Max download speed (KiB/s)</property>
@@ -121,7 +106,7 @@
                         <property name="activates_default">True</property>
                         <property name="invisible_char_set">True</property>
                         <property name="adjustment">adjustment1</property>
-                        <signal name="value-changed" handler="on_max_upload_speed_value_changed" swapped="no"/>
+                        <signal name="value_changed" handler="on_max_upload_speed_value_changed"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -140,7 +125,7 @@
                         <property name="activates_default">True</property>
                         <property name="invisible_char_set">True</property>
                         <property name="adjustment">adjustment2</property>
-                        <signal name="value-changed" handler="on_max_download_speed_value_changed" swapped="no"/>
+                        <signal name="value_changed" handler="on_max_download_speed_value_changed"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -157,31 +142,28 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkVButtonBox" id="vbuttonbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="layout_style">center</property>
             <child>
               <object class="GtkButton" id="remove">
-                <property name="label" translatable="yes">Remove from my personal cloud</property>
+                <property name="label">gtk-remove</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <signal name="activate" handler="on_remove_clicked" swapped="no"/>
-                <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_remove_clicked"/>
+                <signal name="activate" handler="on_remove_clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -192,7 +174,6 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
@@ -200,18 +181,14 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="warning_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>

=== modified file 'data/management.ui'
--- data/management.ui	2011-01-21 21:43:01 +0000
+++ data/management.ui	2011-01-25 12:57:15 +0000
@@ -98,7 +98,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="volumes_button">
-                            <property name="label" translatable="yes">Cloud Storage</property>
+                            <property name="label" translatable="yes">Cloud Folders</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-01-24 14:09:48 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-01-25 12:57:15 +0000
@@ -182,7 +182,7 @@
         self.connect('delete-event', lambda w, e: gtk.main_quit())
         self.show()
 
-        self.control_panel = ControlPanel(window_id=self.window.xid)
+        self.control_panel = ControlPanel(main_window=self)
         self.add(self.control_panel)
 
         logger.info('Starting %s pointing at panel: %r.',
@@ -209,17 +209,17 @@
 
     # should not be any larger than 736x525
 
-    def __init__(self, window_id=0):
+    def __init__(self, main_window):
         gtk.Notebook.__init__(self)
-        self._window_id = window_id
+        self.main_window = main_window
 
         self.set_show_tabs(False)
         self.set_show_border(False)
 
-        self.overview = OverviewPanel(window_id=self._window_id)
+        self.overview = OverviewPanel(main_window=main_window)
         self.insert_page(self.overview, position=0)
 
-        self.management = ManagementPanel()
+        self.management = ManagementPanel(main_window=main_window)
         self.insert_page(self.management, position=1)
 
         self.overview.connect('credentials-found',
@@ -320,7 +320,7 @@
     CONNECT = _('Connect to Ubuntu One')
     BULLET = '<span foreground="%s">✔</span>' % ORANGE
 
-    def __init__(self, messages=None, window_id=0):
+    def __init__(self, main_window, messages=None):
         GreyableBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='overview.ui')
         self.add(self.itself)
@@ -332,9 +332,9 @@
         self.join_now_button.get_child().set_markup(label)
         self.connect_button.set_uri(self.CONNECT)
 
+        self.main_window = main_window
         self._credentials_are_new = False
         self._messages = messages
-        self._window_id = window_id
         self._build_messages()
         self.show()
 
@@ -404,7 +404,7 @@
     def on_join_now_button_clicked(self, *a, **kw):
         """User wants to join now."""
         settings = {TC_URL_KEY: U1_TC_URL, HELP_TEXT_KEY: U1_DESCRIPTION,
-                    WINDOW_ID_KEY: str(self._window_id),
+                    WINDOW_ID_KEY: str(self.main_window.window.xid),
                     PING_URL_KEY: U1_PING_URL}
         self.sso_backend.register(U1_APP_NAME, settings,
             reply_handler=NO_OP, error_handler=error_handler)
@@ -414,7 +414,7 @@
     def on_connect_button_clicked(self, *a, **kw):
         """User wants to connect now."""
         settings = {TC_URL_KEY: U1_TC_URL, HELP_TEXT_KEY: U1_DESCRIPTION,
-                    WINDOW_ID_KEY: str(self._window_id),
+                    WINDOW_ID_KEY: str(self.main_window.window.xid),
                     PING_URL_KEY: U1_PING_URL}
         self.sso_backend.login(U1_APP_NAME, settings,
             reply_handler=NO_OP, error_handler=error_handler)
@@ -476,7 +476,7 @@
     TYPE = _('Account type')
     EMAIL = _('Email address')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='dashboard.ui')
         self.add(self.itself)
@@ -512,10 +512,10 @@
 class VolumesPanel(UbuntuOneBin, ControlPanelMixin):
     """The volumes panel."""
 
-    TITLE = _('Select which folders from your cloud you want synchronized '
-              'on this device.')
-    MY_FOLDERS = _('Mine')
-    ALWAYS_SUBSCRIBED = _('Always in your personal cloud storage!')
+    TITLE = _('Select the folders from your cloud that you want synchronized '
+              'in this device.')
+    MY_FOLDERS = _('My folders')
+    ALWAYS_SUBSCRIBED = _('Always in sync!')
     FREE_SPACE = _('%(free_space)s available storage')
     CONTACT_ICON_NAME = 'system-users'
     FOLDER_ICON_NAME = 'folder'
@@ -525,7 +525,7 @@
     ROOT = '%s - <span foreground="%s" font_size="small">%s</span>'
     NO_VOLUMES = _('No folders to show.')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='volumes.ui')
         self.add(self.itself)
@@ -639,7 +639,7 @@
 
     TITLE = _('Manage permissions for shares made to other users.')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
         ControlPanelMixin.__init__(self)
         self.show_all()
@@ -652,11 +652,13 @@
     DEVICE_CHANGE_ERROR = _('The settings could not be changed,\n'
                             'previous values were restored.')
     DEVICE_REMOVAL_ERROR = _('The device could not be removed.')
+    REMOVABLE_PREFIX = 'Ubuntu One @ '
 
-    def __init__(self):
+    def __init__(self, confirm_remove_dialog=None):
         gtk.EventBox.__init__(self)
         ControlPanelMixin.__init__(self, filename='device.ui')
 
+        self.confirm_dialog = confirm_remove_dialog
         self._updating = False
         self._last_settings = {}
         self.id = None
@@ -714,9 +716,15 @@
 
     def on_remove_clicked(self, widget):
         """Remove button was clicked or activated."""
-        self.backend.remove_device(self.id,
-            reply_handler=NO_OP, error_handler=error_handler)
-        self.set_sensitive(False)
+        response = gtk.RESPONSE_YES
+        if self.confirm_dialog is not None:
+            response = self.confirm_dialog.run()
+            self.confirm_dialog.hide()
+
+        if response == gtk.RESPONSE_YES:
+            self.backend.remove_device(self.id,
+                reply_handler=NO_OP, error_handler=error_handler)
+            self.set_sensitive(False)
 
     @_block_signals
     def update(self, **kwargs):
@@ -738,8 +746,9 @@
             self.id = kwargs['device_id']
 
         if 'device_name' in kwargs:
-            name = '<span font_size="large"><b>%s</b></span>'
-            self.device_name.set_markup(name % kwargs['device_name'])
+            name = kwargs['device_name'].replace(self.REMOVABLE_PREFIX, '')
+            name = '<span font_size="large"><b>%s</b></span>' % name
+            self.device_name.set_markup(name)
 
         if 'device_type' in kwargs:
             dtype = kwargs['device_type']
@@ -818,16 +827,24 @@
 class DevicesPanel(UbuntuOneBin, ControlPanelMixin):
     """The devices panel."""
 
-    TITLE = _('The devices in your personal cloud are listed below.')
+    TITLE = _('The devices synced with your personal cloud are listed below.')
     NO_DEVICES = _('No devices to show.')
+    CONFIRM_REMOVE = _('Are you sure you want to remove this device '
+                       'from Ubuntu One?')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='devices.ui')
         self.add(self.itself)
         self.show()
 
         self._devices = {}
+        kw = dict(parent=main_window,
+                  flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                  type=gtk.MESSAGE_WARNING,
+                  buttons=gtk.BUTTONS_YES_NO,
+                  message_format=self.CONFIRM_REMOVE)
+        self.confirm_remove_dialog = gtk.MessageDialog(**kw)
 
         self.backend.connect_to_signal('DevicesInfoReady',
                                        self.on_devices_info_ready)
@@ -849,7 +866,7 @@
 
         odd_row_color = self.message.style.bg[gtk.STATE_NORMAL]
         for i, device_info in enumerate(info):
-            device = Device()
+            device = Device(confirm_remove_dialog=self.confirm_remove_dialog)
             device_info['device_name'] = device_info.pop('name', '')
             device_info['device_type'] = device_info.pop('type',
                                                          DEVICE_TYPE_COMPUTER)
@@ -1086,7 +1103,7 @@
     CONTACTS = _('Contacts (Evolution)')
     NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
         ControlPanelMixin.__init__(self, filename='services.ui')
         self.add(self.itself)
@@ -1333,7 +1350,7 @@
 
     QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
 
-    def __init__(self):
+    def __init__(self, main_window=None):
         gtk.VBox.__init__(self)
         ControlPanelMixin.__init__(self, filename='management.ui')
         self.add(self.itself)
@@ -1353,11 +1370,11 @@
         self.status_label = FileSyncStatus()
         self.status_box.pack_end(self.status_label, expand=False)
 
-        self.dashboard = DashboardPanel()
-        self.volumes = VolumesPanel()
-        self.shares = SharesPanel()
-        self.devices = DevicesPanel()
-        self.services = ServicesPanel()
+        self.dashboard = DashboardPanel(main_window=main_window)
+        self.volumes = VolumesPanel(main_window=main_window)
+        self.shares = SharesPanel(main_window=main_window)
+        self.devices = DevicesPanel(main_window=main_window)
+        self.services = ServicesPanel(main_window=main_window)
 
         cb = lambda button, page_num: self.notebook.set_current_page(page_num)
         self.tabs = (u'dashboard', u'volumes', u'shares',

=== modified file 'ubuntuone/controlpanel/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gtk/tests/__init__.py	2011-01-21 02:29:20 +0000
+++ ubuntuone/controlpanel/gtk/tests/__init__.py	2011-01-25 12:57:15 +0000
@@ -66,14 +66,14 @@
 }
 
 FAKE_DEVICES_INFO = [
-    {'device_id': '0', 'name': 'Foo', 'type': 'Computer',
-     'is_local': '', 'configurable': ''},
-    {'device_id': '1', 'name': 'Bar', 'type': 'Phone',
-     'is_local': '', 'configurable': ''},
-    {'device_id': '2', 'name': 'Z', 'type': 'Computer',
+    {'device_id': '0', 'name': 'Ubuntu One @ Foo', 'type': 'Computer',
+     'is_local': '', 'configurable': ''},
+    {'device_id': '1', 'name': 'Ubuntu One @ Bar', 'type': 'Phone',
+     'is_local': '', 'configurable': ''},
+    {'device_id': '2', 'name': 'Ubuntu One @ Z', 'type': 'Computer',
      'is_local': '', 'configurable': 'True', 'limit_bandwidth': '',
      'max_upload_speed': '0', 'max_download_speed': '0'},
-    {'device_id': '1258-6854', 'name': 'Baz', 'type': 'Computer',
+    {'device_id': '1258-6854', 'name': 'Ubuntu One @ Baz', 'type': 'Computer',
      'is_local': 'True', 'configurable': 'True', 'limit_bandwidth': 'True',
      'max_upload_speed': '1000', 'max_download_speed': '72548'},  # local
 ]
@@ -195,3 +195,21 @@
         yield
         self._installed[package_name] = True
         gui.package_manager.return_value(FakedTransaction([package_name]))
+
+
+class FakedConfirmDialog(object):
+    """Fake a confirmation dialog."""
+
+    def __init__(self, *args, **kwargs):
+        self._args = args
+        self._kwargs = kwargs
+        self.was_run = False
+        self.is_visible = True
+        self.show = lambda: setattr(self, 'is_visible', True)
+        self.hide = lambda: setattr(self, 'is_visible', False)
+        self.response_code = None
+
+    def run(self):
+        """Set flag and return 'self.response_code'."""
+        self.was_run = True
+        return self.response_code

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-01-21 21:43:01 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-01-25 12:57:15 +0000
@@ -29,7 +29,7 @@
     FAKE_DEVICE_INFO, FAKE_DEVICES_INFO,
     FAKE_VOLUMES_INFO, FAKE_REPLICATIONS_INFO, USER_HOME,
     FakedNMState, FakedSSOBackend, FakedSessionBus, FakedInterface,
-    FakedPackageManager,
+    FakedPackageManager, FakedConfirmDialog,
 )
 from ubuntuone.controlpanel.tests import TOKEN, TestCase
 from ubuntuone.controlpanel.gtk.tests.test_package_manager import (
@@ -55,6 +55,7 @@
         self.patch(gui.os.path, 'expanduser',
                    lambda path: path.replace('~', USER_HOME))
         self.patch(gui.gtk, 'main', lambda: None)
+        self.patch(gui.gtk, 'MessageDialog', FakedConfirmDialog)
         self.patch(gui.dbus, 'SessionBus', FakedSessionBus)
         self.patch(gui.dbus, 'Interface', FakedInterface)
         self.patch(gui.networkstate, 'NetworkManagerState', FakedNMState)
@@ -171,11 +172,9 @@
         self.assertIsInstance(self.ui.control_panel, gui.ControlPanel)
         self.assertTrue(self.ui.control_panel.get_visible())
 
-    def test_window_id_is_passed_to_child(self):
-        """The child gets the window_id."""
-        assert self.ui.window is not None
-        self.assertEqual(self.ui.control_panel._window_id,
-                         self.ui.window.xid)
+    def test_main_window_is_passed_to_child(self):
+        """The child gets the main_window."""
+        self.assertEqual(self.ui.control_panel.main_window, self.ui)
 
     def test_icon_name_is_correct(self):
         """The icon name is correct."""
@@ -225,7 +224,7 @@
     """The test suite for the control panel itself."""
 
     klass = gui.ControlPanel
-    kwargs = {'window_id': 7}
+    kwargs = {'main_window': object()}
 
     def assert_current_tab_correct(self, expected_tab):
         """Check that the wiget 'expected_tab' is the current page."""
@@ -251,9 +250,10 @@
         self.assertIsInstance(self.ui.overview, gui.OverviewPanel)
         self.assert_current_tab_correct(self.ui.overview)
 
-    def test_window_id_is_passed_to_child(self):
-        """The child gets the window_id."""
-        self.assertEqual(self.ui.overview._window_id, self.kwargs['window_id'])
+    def test_main_window_is_passed_to_child(self):
+        """The child gets the main_window."""
+        self.assertEqual(self.ui.overview.main_window,
+                         self.kwargs['main_window'])
 
     def test_on_show_management_panel(self):
         """A ManagementPanel is shown when the callback is executed."""
@@ -392,7 +392,7 @@
     """The test suite for the overview panel."""
 
     klass = gui.OverviewPanel
-    kwargs = {'messages': None, 'window_id': 8}
+    kwargs = {'messages': None, 'main_window': gui.gtk.Window()}
     ui_filename = 'overview.ui'
 
     def test_is_a_greyable_bin(self):
@@ -591,24 +591,32 @@
 
     def test_join_now_button_clicked(self):
         """Test the 'join now' button callback."""
+        self.kwargs['main_window'].show()  # ensure parent window is realized
+        self.addCleanup(self.kwargs['main_window'].hide)
+
         self.ui.join_now_button.clicked()
 
+        window_id = self.kwargs['main_window'].window.xid
         args = (gui.U1_APP_NAME,
                 {gui.TC_URL_KEY: gui.U1_TC_URL,
                  gui.HELP_TEXT_KEY: gui.U1_DESCRIPTION,
-                 gui.WINDOW_ID_KEY: str(self.kwargs['window_id']),
+                 gui.WINDOW_ID_KEY: str(window_id),
                  gui.PING_URL_KEY: gui.U1_PING_URL})
         self.assert_backend_called('register', args,
                                    backend=self.ui.sso_backend)
 
     def test_connect_button_clicked(self):
         """Test the 'join now' button callback."""
+        self.kwargs['main_window'].show()  # ensure parent window is realized
+        self.addCleanup(self.kwargs['main_window'].hide)
+
         self.ui.connect_button.clicked()
 
+        window_id = self.kwargs['main_window'].window.xid
         args = (gui.U1_APP_NAME,
                 {gui.TC_URL_KEY: gui.U1_TC_URL,
                  gui.HELP_TEXT_KEY: gui.U1_DESCRIPTION,
-                 gui.WINDOW_ID_KEY: str(self.kwargs['window_id']),
+                 gui.WINDOW_ID_KEY: str(window_id),
                  gui.PING_URL_KEY: gui.U1_PING_URL})
         self.assert_backend_called('login', args,
                                    backend=self.ui.sso_backend)
@@ -967,8 +975,8 @@
         """Assert that the device has the values from expected."""
         self.assertEqual(device.id,
                          expected['device_id'])
-        self.assertEqual(device.device_name.get_text(),
-                         expected['device_name'])
+        value = expected['device_name'].replace(self.ui.REMOVABLE_PREFIX, '')
+        self.assertEqual(device.device_name.get_text(), value)
         self.assertEqual(device.device_type.get_icon_name()[0],
                          expected['device_type'].lower())
         self.assertEqual(device.is_local,
@@ -1040,13 +1048,13 @@
     def test_update_device_name(self):
         """A device can be updated from a dict."""
         value = 'The death star'
-        self.ui.update(device_name=value)
+        self.ui.update(device_name=self.ui.REMOVABLE_PREFIX + value)
         self.assertEqual(value, self.ui.device_name.get_text())
 
     def test_update_unicode_device_name(self):
         """A device can be updated from a dict."""
         value = u'Ñoño Ñandú'
-        self.ui.update(device_name=value)
+        self.ui.update(device_name=self.ui.REMOVABLE_PREFIX + value)
         self.assertEqual(value, self.ui.device_name.get_text())
 
     def test_update_device_type_computer(self):
@@ -1237,11 +1245,53 @@
                          'Must be disabled after other device removal error.')
 
 
+class RemoveDeviceTestCase(DeviceTestCase):
+    """The test suite for the device widget when prompting for removal."""
+
+    confirm_dialog = FakedConfirmDialog()
+    kwargs = {'confirm_remove_dialog': confirm_dialog}
+
+    def test_remove(self):
+        """Clicking on remove calls the backend properly."""
+        self.confirm_dialog.response_code = gui.gtk.RESPONSE_YES
+        super(RemoveDeviceTestCase, self).test_remove()
+
+    def test_on_device_removal_error_other_id(self):
+        """On other device removal error, do nothing."""
+        self.confirm_dialog.response_code = gui.gtk.RESPONSE_YES
+        parent_test = super(RemoveDeviceTestCase, self)
+        parent_test.test_on_device_removal_error_other_id()
+
+    def test_remove_shows_confirmation_dialog(self):
+        """Clicking on remove displays a confirmation dialog."""
+        self.ui.remove.clicked()
+
+        self.assertTrue(self.confirm_dialog.was_run, 'dialog was run')
+        self.assertFalse(self.confirm_dialog.is_visible, 'dialog was hid')
+
+    def test_remove_does_not_call_backend_if_dialog_closed(self):
+        """Backend is not called if users closes the confirmation dialog."""
+        self.confirm_dialog.response_code = gui.gtk.RESPONSE_DELETE_EVENT
+        self.ui.remove.clicked()
+
+        self.assertNotIn('remove_device', self.ui.backend._called)
+        self.assertTrue(self.ui.is_sensitive())
+
+    def test_remove_does_not_call_backend_if_answer_is_no(self):
+        """Backend is not called if users clicks on 'No'."""
+        self.confirm_dialog.response_code = gui.gtk.RESPONSE_NO
+        self.ui.remove.clicked()
+
+        self.assertNotIn('remove_device', self.ui.backend._called)
+        self.assertTrue(self.ui.is_sensitive())
+
+
 class DevicesTestCase(ControlPanelMixinTestCase):
     """The test suite for the devices panel."""
 
     klass = gui.DevicesPanel
     ui_filename = 'devices.ui'
+    kwargs = {'main_window': object()}
 
     def setUp(self):
         super(DevicesTestCase, self).setUp()
@@ -1259,6 +1309,18 @@
         """Is visible."""
         self.assertTrue(self.ui.get_visible())
 
+    def test_confirm_remove_dialog(self):
+        """The confirmation dialog is correct."""
+        dialog = self.ui.confirm_remove_dialog
+
+        self.assertEqual(dialog._args, ())
+        flags = gui.gtk.DIALOG_MODAL | gui.gtk.DIALOG_DESTROY_WITH_PARENT
+        kwargs = dict(parent=self.kwargs['main_window'],
+                      flags=flags, type=gui.gtk.MESSAGE_WARNING,
+                      buttons=gui.gtk.BUTTONS_YES_NO,
+                      message_format=self.ui.CONFIRM_REMOVE)
+        self.assertEqual(dialog._kwargs, kwargs)
+
     def test_backend_signals(self):
         """The proper signals are connected to the backend."""
         self.assertEqual(self.ui.backend._signals['DevicesInfoReady'],
@@ -1312,8 +1374,8 @@
             self.assertIsInstance(child, gui.Device)
 
             self.assertEqual(device['device_id'], child.id)
-            self.assertEqual(device['device_name'],
-                             child.device_name.get_text())
+            value = device['device_name'].replace(child.REMOVABLE_PREFIX, '')
+            self.assertEqual(value, child.device_name.get_text())
             self.assertEqual(device['device_type'].lower(),
                              child.device_type.get_icon_name()[0])
             self.assertEqual(bool(device['is_local']),
@@ -1331,6 +1393,8 @@
                 self.assertEqual(value,
                                  child.max_download_speed.get_value_as_int())
 
+            self.assertIs(child.confirm_dialog, self.ui.confirm_remove_dialog)
+
     def test_on_devices_info_ready_have_devices_cached(self):
         """The devices are cached for further removal."""
         self.ui.on_devices_info_ready(FAKE_DEVICES_INFO)

=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-01-20 14:31:24 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2011-01-25 12:57:15 +0000
@@ -205,6 +205,8 @@
 class TestCase(BaseTestCase):
     """Basics for testing."""
 
+    assertIs = BaseTestCase.assertIdentical
+
     def setUp(self):
         self._called = False