Merge pull request #508 from muffinresearch/point-to-spartacus-for-wait

Use SPA wait-to-finish if SPA_ENABLED is True (WiP)
mozilla · Jul 3, 2014 · 088ea4f · 088ea4f
2 parents 203cfa5 + c0e8866
commit 088ea4f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/lib/solitude/api.py b/lib/solitude/api.py
@@ -644,6 +644,12 @@ def get_product(self, generic_seller, generic_product):
         # Boku does not have a products API the way Bango does.
         return None
 
+    def get_finish_url_name(self):
+        if settings.SPA_ENABLE and settings.SPA_ENABLE_URLS:
+            return 'spa.wait_to_finish'
+        else:
+            return 'provider.wait_to_finish'
+
     def create_product(self, generic_product, provider_seller, external_id,
                        product_name):
         # Boku does not have a products API the way Bango does.
@@ -680,7 +686,7 @@ def create_transaction(self, generic_seller, generic_product,
                 .format(mcc=mcc, mnc=mnc, r=mcc_region))
 
         provider_trans = self.api.transactions.post({
-            'forward_url': absolutify(reverse('provider.wait_to_finish',
+            'forward_url': absolutify(reverse(self.get_finish_url_name(),
                                               args=[self.name])),
             'callback_url': absolutify(reverse('provider.notification',
                                                args=[self.name])),

diff --git a/lib/solitude/tests.py b/lib/solitude/tests.py
@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
+from django import test
 from django.test import TestCase
 
 import mobile_codes
@@ -614,6 +615,16 @@ def configure(self, **kw):
         kw.setdefault('mnc', '020')  # AMX
         return super(TestBoku, self).configure(**kw)
 
+    @test.utils.override_settings(SPA_ENABLE=False)
+    def test_get_finish_url_name(self):
+        eq_(self.provider.provider.get_finish_url_name(),
+            'provider.wait_to_finish')
+
+    @test.utils.override_settings(SPA_ENABLE=True)
+    def test_get_finish_url_spa(self):
+        eq_(self.provider.provider.get_finish_url_name(),
+            'spa.wait_to_finish')
+
     def test_start_transaction(self):
         boku_pay_url = 'https://site/buy'
         boku_transaction_id = 'boku-trans-id'

diff --git a/webpay/spa/tests/test_views.py b/webpay/spa/tests/test_views.py
@@ -56,7 +56,7 @@ class TestWaitToFinish(ProviderTestCase):
 
     def setUp(self):
         super(TestWaitToFinish, self).setUp()
-        self.wait_url = reverse('spa_wait_to_finish', args=['boku'])
+        self.wait_url = reverse('spa.wait_to_finish', args=['boku'])
 
     def wait(self, trans_uuid=None):
         if not trans_uuid:

diff --git a/webpay/urls.py b/webpay/urls.py
@@ -23,8 +23,10 @@
 
 if settings.SPA_ENABLE_URLS:
     urlpatterns += patterns('',
-        url(r'^mozpay/spa/(?P<provider_name>[^/]+)/wait-to-finish', spa_wait_to_finish, name='spa_wait_to_finish'),
-        url(r'^mozpay/spa/(?:' + '|'.join(settings.SPA_URLS) + ')$', spa_index),
+        url(r'^mozpay/spa/(?P<provider_name>[^/]+)/wait-to-finish',
+            spa_wait_to_finish, name='spa.wait_to_finish'),
+        url(r'^mozpay/spa/(?:' + '|'.join(settings.SPA_URLS) + ')$',
+            spa_index, name='spa.index'),
         url(r'^mozpay/v1/api/', include('webpay.api.urls', namespace='api'))
     )