Merge pull request #624 from andymckay/926575

actually pass the network used through to solitude (bug 926575)
mozilla · Apr 4, 2015 · 0bcf9c5 · 0bcf9c5
2 parents 9c07942 + e814df9
commit 0bcf9c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/solitude/api.py b/lib/solitude/api.py
@@ -592,8 +592,8 @@ def create_transaction(self, generic_buyer, generic_seller,
         # In the case of Zippy, it does not detect any of these values
         # itself. All other providers will detect these values without
         # help from Webpay.
-        carrier = 'USA_TMOBILE'
-        region = '123'
+        carrier = 'FAKE'
+        region = 'CAN'
         pay_method = 'OPERATOR'
         # How do we decide what price to show? Normally Bango does this
         # by deciding based on region detection. For our purposes, let's just

diff --git a/lib/solitude/tests.py b/lib/solitude/tests.py
@@ -561,10 +561,10 @@ def test_start_with_existing_prod(self):
 
         self.slumber.generic.transaction.post.assert_called_with({
             'amount': '1.99',
-            'carrier': 'USA_TMOBILE',
+            'carrier': 'FAKE',
             'currency': 'USD',
             'provider': constants.PROVIDER_REFERENCE,
-            'region': '123',
+            'region': 'CAN',
             'buyer': self.buyer_uri,
             'seller': self.seller_uri,
             'seller_product': self.product_uri,
@@ -634,10 +634,10 @@ def test_with_new_prod(self):
             'Unexpected: {0}'.format(kw['error_url']))
         self.slumber.generic.transaction.post.assert_called_with({
             'amount': '1.99',
-            'carrier': 'USA_TMOBILE',
+            'carrier': 'FAKE',
             'currency': 'USD',
             'provider': constants.PROVIDER_REFERENCE,
-            'region': '123',
+            'region': 'CAN',
             'buyer': self.buyer_uri,
             'seller': self.seller_uri,
             'seller_product': self.product_uri,

diff --git a/webpay/bango/tests/test_views.py b/webpay/bango/tests/test_views.py
@@ -39,7 +39,8 @@ def call(self, overrides=None, expected_status=200,
               'Price': '0.99',
               'Currency': 'EUR',
               'BangoTransactionId': '456',
-              'Token': '<bango-guid>'}
+              'Token': '<bango-guid>',
+              'Network': 'USA_TMOBILE'}
         if overrides:
             qs.update(overrides)
         res = self.client.get(reverse(url), qs)

diff --git a/webpay/bango/views.py b/webpay/bango/views.py
@@ -59,6 +59,7 @@ def _record(request):
             'bango_token': qs.get('Token'),
             'amount': qs.get('Price'),
             'currency': qs.get('Currency'),
+            'network': qs.get('Network')
         })
     except HttpClientError, err:
         log.error('Bango payment notice for transaction uuid %r '