Merge lp:~diegosarmentero/ubuntuone-windows-installer/successful-page into lp:ubuntuone-windows-installer

[Diego Sarmentero]

- Fixed: Process finished successfully (LP: #859743).

Fixed: Process finished successfully (LP: #859743).

[lp:~diegosarmentero/ubuntuone-windows-installer/successful-page]

86. By Diego Sarmentero on 2011-10-24

Fixed tests

87. By Diego Sarmentero on 2011-10-24

merge

88. By Diego Sarmentero on 2011-10-24

Conflicts resolved

[Diego Sarmentero (diegosarmentero)]

+1... i don't know why i appear as a reviewer of my own branch :P

review: Approve

[Diego Sarmentero (diegosarmentero)]

review: Abstain

[lp:~diegosarmentero/ubuntuone-windows-installer/successful-page]

89. By Diego Sarmentero on 2011-11-07

merge

90. By Diego Sarmentero on 2011-11-08

merge

91. By Diego Sarmentero on 2011-11-08

Fixed lint issues

92. By Diego Sarmentero on 2011-11-08

merge

[Natalia Bidart (nataliabidart)]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1020, in _inlineCallbacks
    result = g.send(result)
  File "/home/nessita/canonical/windows-installer/review_successful-page/ubuntuone_installer/gui/qt/tests/__init__.py", line 204, in setUp
    self.ui = self.class_ui(**self.kwargs)
  File "/home/nessita/canonical/windows-installer/review_successful-page/ubuntuone_installer/gui/qt/gui.py", line 431, in __init__
    self.success = SuccessPage(self)
  File "/home/nessita/canonical/windows-installer/review_successful-page/ubuntuone_installer/gui/qt/gui.py", line 278, in __init__
    self.ui.image_label.setPixmap(
exceptions.AttributeError: 'Ui_SuccessPage' object has no attribute 'image_label'

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_choose_signin_cancel
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_close_callback_can_be_none
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_congratulations_adds_to_autostart
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_continue_cancels_cancel
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_critical
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_critical_in_proper_page
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_current_user_controller_parameters
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_current_user_controller_params
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_current_user_initialize
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_done_calls_custom_close_callback
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_execute_uninstall_on_licence_cancel
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_execute_uninstall_on_licence_cancel_frozen
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_folders_page_next_id
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_folders_page_with_back
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_forgotten_password_controller_error
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_forgotten_password_controller_params
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_initialize_page
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_insert_remove_critical_message
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_license_page_check_connection_error
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_license_page_check_connection_no_button
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_main_window_general_config
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_network_detection_connection_disabled
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_network_detection_connection_disabled_signin
ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_network_detection_connection_enabled
ubuntuone_installer.gui.qt.tests.test_...

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/successful-page]

93. By Diego Sarmentero on 2011-11-10

Removed changes from network-detect branch

[Natalia Bidart (nataliabidart)]

Looks good!

Please unify the assertEqualPixmaps definition moving it to BaseTestCase.

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/successful-page]

94. By Diego Sarmentero on 2011-11-10

Tests improved.

[Alejandro J. Cura (alecu)]

+1. Don't forget to set the commit message!

review: Approve

=== added file 'data/qt/network_detection.ui'
--- data/qt/network_detection.ui	1970-01-01 00:00:00 +0000
+++ data/qt/network_detection.ui	2011-11-10 14:04:24 +0000
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWizardPage" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>541</width>
+    <height>365</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="image_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>400</width>
+         <height>150</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="message_label">
+     <property name="text">
+      <string>Ubuntu One has installed!</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Are you online? We can't detect an internet connection - you will need to be connected to set up Ubuntu One</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>76</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
+ <connections/>
+</ui>

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-10-20 13:27:28 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-11-10 14:04:24 +0000
@@ -57,6 +57,10 @@
     TC_URL,
 )
 
+# Module used to include the resources into this file
+# pylint: disable=W0611
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
 from ubuntuone_installer.logger import setup_logging
 from ubuntuone_installer.gui.qt.ui import (
     choose_sign_in_ui,
@@ -85,6 +89,7 @@
 CREDENTIALS_ERROR = _('Application will close.\n\n%r')
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
+SUCCESSFUL_LOGIN = _("Login successful")
 UPDATE_TITLE = _("Updates are available")
 UPDATE_SOFTWARE = _("There is a new version available. "
                     "Do you want perform an upgrade?")
@@ -214,10 +219,13 @@
 
     def __init__(self, parent=None):
         super(SuccessPage, self).__init__(
-            Ui_SuccessPage(), SuccessController(), parent)
+            Ui_SuccessPage(),
+            SuccessController(title=SUCCESSFUL_LOGIN), parent)
         self.backend = backend.ControlBackend()
         self.finish_button = None
         self.next_button = None
+        self.ui.image_label.setPixmap(
+            QtGui.QPixmap(':/win_installer_graphic.png'))
 
     def initializePage(self):
         """Setup UI details."""
@@ -330,7 +338,6 @@
         # PyQt doesn't support the (int, page) version of addPage, so
         # Add the pages in the right order
         # pylint: disable=C0103
-
         self.license_page = LicensePage()
         self.LICENSE_PAGE = self.addPage(self.license_page)
 

=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2011-11-04 11:07:11 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2011-11-10 14:04:24 +0000
@@ -208,3 +208,19 @@
             self.ui.backend._called.clear()
 
         self.patch(loadingoverlay, 'LoadingOverlay', FakeOverlay)
+
+    def get_pixmap_data(self, pixmap):
+        """Get the raw data of a QPixmap."""
+        byte_array = QtCore.QByteArray()
+        array_buffer = QtCore.QBuffer(byte_array)
+        pixmap.save(array_buffer, "PNG")
+        return byte_array
+
+    # Invalid name "assertEqualPixmap"
+    # pylint: disable=C0103
+
+    def assertEqualPixmaps(self, pixmap1, pixmap2):
+        """Compare two Qt pixmaps."""
+        d1 = self.get_pixmap_data(pixmap1)
+        d2 = self.get_pixmap_data(pixmap2)
+        self.assertEqual(d1, d2)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-10-28 16:32:22 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-11-10 14:04:24 +0000
@@ -24,6 +24,10 @@
 from ubuntuone.platform.credentials import APP_NAME
 from twisted.internet import defer
 
+# Module used to include the resources into this file
+# pylint: disable=W0611
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
 from ubuntuone_installer.gui.qt.tests import (
@@ -623,6 +627,7 @@
         self.overlay = FakeOverlay()
         self.local_folders_page = FakeWizardPage()
         self.folders_page = FakeWizardPage()
+        self.app_name = 'app_name'
 
     def show(self):
         """Fake method."""
@@ -681,6 +686,8 @@
          QtGui.QWizard.NextButton])
         self.assertTrue(self.ui.next_button.isDefault())
         self.assertFalse(self.ui.finish_button.isDefault())
+        self.assertEqualPixmaps(self.ui.ui.image_label.pixmap(),
+            QtGui.QPixmap(':/win_installer_graphic.png'))
         self.assertEqual(self.ui.backend.called, ['connect_files'])
 
 

=== modified file 'ubuntuone_installer/gui/qt/tests/test_side_widget.py'
--- ubuntuone_installer/gui/qt/tests/test_side_widget.py	2011-09-02 12:58:29 +0000
+++ ubuntuone_installer/gui/qt/tests/test_side_widget.py	2011-11-10 14:04:24 +0000
@@ -19,7 +19,7 @@
 
 """Tests for the Qt UI."""
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
 
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 from ubuntuone_installer.gui.qt.side_widget import SideWidget
@@ -87,22 +87,6 @@
             self.ui.ui.sync_label.isEnabled(), True)
         self.check_state_pixmap(3)
 
-    def get_pixmap_data(self, pixmap):
-        """Get the raw data of a QPixmap."""
-        byte_array = QtCore.QByteArray()
-        array_buffer = QtCore.QBuffer(byte_array)
-        pixmap.save(array_buffer, "PNG")
-        return byte_array
-
-    # Invalid name "assertEqualPixmap"
-    # pylint: disable=C0103
-
-    def assertEqualPixmaps(self, pixmap1, pixmap2):
-        """Compare two Qt pixmaps."""
-        d1 = self.get_pixmap_data(pixmap1)
-        d2 = self.get_pixmap_data(pixmap2)
-        self.assertEqual(d1, d2)
-
     def check_state_pixmap(self, stage):
         """Check if each label has the proper pixmap depending on the state."""
         active_pixmap = QtGui.QPixmap(":/progress_arrow_orange.png")