Ubuntu Single Sign On Client

Merge lp:~diegosarmentero/ubuntu-sso-client/uistr-fix into lp:ubuntu-sso-client

  1. uistr-fix
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 810
Merged at revision: 812
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/uistr-fix
Merge into: lp:ubuntu-sso-client
Diff against target: 44 lines (+9/-4)
2 files modified
ubuntu_sso/gtk/gui.py (+3/-2)
ubuntu_sso/gtk/tests/test_gui.py (+6/-2)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/uistr-fix
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+82001@code.launchpad.net

Commit message

Fixed: GTK UI shows %{app_name}s in the congratulations page (LP: #889155).

Description of the change

Fixed: GTK UI shows %{app_name}s in the congratulations page (LP: #889155).

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks great!

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

+1 Code looks clean and I have ran the tests on N.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/gtk/gui.py'
2--- ubuntu_sso/gtk/gui.py 2011-09-15 23:18:59 +0000
3+++ ubuntu_sso/gtk/gui.py 2011-11-11 17:18:23 +0000
4@@ -322,8 +322,9 @@
5 @property
6 def success_vbox(self):
7 """The success page."""
8- self.finish_vbox.label.set_markup('<span size="x-large">%s</span>' %
9- SUCCESS)
10+ message = SUCCESS % {'app_name': self.app_name}
11+ message = '<span size="x-large">%s</span>' % message
12+ self.finish_vbox.label.set_markup(message)
13 return self.finish_vbox
14
15 @property
16
17=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
18--- ubuntu_sso/gtk/tests/test_gui.py 2011-11-02 16:56:12 +0000
19+++ ubuntu_sso/gtk/tests/test_gui.py 2011-11-11 17:18:23 +0000
20@@ -647,7 +647,10 @@
21 """When calling 'finish_success' the success page is shown."""
22 self.ui.finish_success()
23 self.assert_pages_visibility(finish=True)
24- self.assertEqual(gui.SUCCESS, self.ui.finish_vbox.label.get_text())
25+ self.assertEqual(gui.SUCCESS % {'app_name': APP_NAME},
26+ self.ui.finish_vbox.label.get_text())
27+ result = self.ui.finish_vbox.label.get_text()
28+ self.assertTrue(self.ui.app_name in result)
29
30 def test_finish_error_shows_error_page(self):
31 """When calling 'finish_error' the error page is shown."""
32@@ -1207,10 +1210,11 @@
33
34 def test_success_label_is_correct(self):
35 """The success message is correct."""
36- self.assertEqual(gui.SUCCESS,
37+ self.assertEqual(gui.SUCCESS % {'app_name': APP_NAME},
38 self.ui.success_vbox.label.get_text())
39 markup = self.ui.success_vbox.label.get_label()
40 self.assertTrue('<span size="x-large">' in markup)
41+ self.assertTrue(self.ui.app_name in markup)
42
43 def test_error_label_is_correct(self):
44 """The error message is correct."""

Subscribers

People subscribed via source and target branches