use Translation objects in the tests

jbalogh · Aug 5, 2010 · 459fe4f · 459fe4f
1 parent 960cbb0
commit 459fe4f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/apps/reviews/feeds.py b/apps/reviews/feeds.py
@@ -23,7 +23,7 @@ def get_object(self, request, addon_id):
 
     def title(self, addon):
         """Title for the feed"""
-        return _('Reviews for %s') % addon.name
+        return _(u'Reviews for %s') % addon.name
 
     def link(self, addon):
         """Link for the feed"""
@@ -52,7 +52,7 @@ def item_title(self, review):
         if getattr(review, 'title', None):
             tag_line = review.title
         divider = ' : ' if rating and tag_line else ''
-        return rating + divider + tag_line
+        return u'%s%s%s' % (rating, divider, tag_line)
 
     def item_description(self, review):
         """Description for particular review (<item><description>)"""

diff --git a/apps/reviews/tests/test_feeds.py b/apps/reviews/tests/test_feeds.py
@@ -4,22 +4,24 @@
 from nose.tools import eq_
 
 from reviews import feeds
+from translations.models import Translation
 
 
 class FeedTest(test_utils.TestCase):
     # Rub some unicode all over the reviews feed.
 
     def setUp(self):
         self.feed = feeds.ReviewsRss()
-        self.wut = u'Ελληνικά'
+        self.u = u'Ελληνικά'
+        self.wut = Translation(localized_string=self.u, locale='el')
 
         self.addon = mock.Mock()
         self.addon.name = self.wut
 
         self.user = mock.Mock()
         self.user.nickname = None
-        self.user.firstname = self.wut
-        self.user.lastname = self.wut
+        self.user.firstname = self.u
+        self.user.lastname = self.u
 
         self.review = mock.Mock()
         self.review.title = self.wut
@@ -28,18 +30,18 @@ def setUp(self):
 
     def test_title(self):
         eq_(self.feed.title(self.addon),
-            'Reviews for %s' % self.wut)
+            u'Reviews for %s' % self.u)
 
     def test_item_title(self):
         eq_(self.feed.item_title(self.review),
-            'Rated %s out of 5 stars : %s' % (self.review.rating, self.wut))
+            'Rated %s out of 5 stars : %s' % (self.review.rating, self.u))
 
         self.review.rating = None
-        eq_(self.feed.item_title(self.review), self.wut)
+        eq_(self.feed.item_title(self.review), self.u)
 
     def test_item_author_name(self):
         eq_(self.feed.item_author_name(self.review),
-            '%s %s' % (self.wut, self.wut))
+            '%s %s' % (self.u, self.u))
 
-        self.user.nickname = self.wut
-        eq_(self.feed.item_author_name(self.review), self.wut)
+        self.user.nickname = self.u
+        eq_(self.feed.item_author_name(self.review), self.u)