Skip to content

Commit

Permalink
Fix order.shipping_status test for Python 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael van Tellingen committed Feb 22, 2015
1 parent 77689b1 commit e1ec3cb
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions tests/integration/order/model_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from django.test import TestCase
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
import mock

from oscar.apps.order.exceptions import (
Expand Down Expand Up @@ -372,20 +373,20 @@ def test_shipping_status(self):
event_2 = ShippingEventFactory(order=order, event_type__name='Returned')

# Default status
self.assertEqual(unicode(order.shipping_status), 'In progress')
self.assertEqual(order.shipping_status, _('In progress'))

# Set first line to shipped
event_1.line_quantities.create(line=line_1, quantity=2)
self.assertEqual(unicode(order.shipping_status), 'In progress')
self.assertEqual(order.shipping_status, _('In progress'))

# Set first line to returned
event_2.line_quantities.create(line=line_1, quantity=2)
self.assertEqual(unicode(order.shipping_status), 'In progress')
self.assertEqual(order.shipping_status, _('In progress'))

# Set second line to shipped
event_1.line_quantities.create(line=line_2, quantity=1)
self.assertEqual(unicode(order.shipping_status), 'Shipped')
self.assertEqual(order.shipping_status, _('Shipped'))

# Set second line to returned
event_2.line_quantities.create(line=line_2, quantity=1)
self.assertEqual(unicode(order.shipping_status), 'Returned')
self.assertEqual(order.shipping_status, _('Returned'))

0 comments on commit e1ec3cb

Please sign in to comment.