Changeset 12770 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

15 Mar 2015, 13:26:44 (10 years ago)

Author:

Henrik Bettermann

Message:

We need to produce unique tokens in ProductOptionSourceFactory?.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• tests/test_browser.py (modified) (1 diff)
• vocabularies.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1484 +1484 @@
         # from the chosen product.
         self.assertTrue(
-            '<option selected="selected" value="Any product option">'
+            '<option selected="selected" value="Any product option_88.8_EUR">'
             'Any product option @ 88.8 Euro</option>'
             in self.browser.contents)
-        self.assertTrue('<option value="First option">First option '
+        self.assertTrue('<option value="First option_99.9_USD">First option '
                         '@ 99.9 US Dollar</option>' in self.browser.contents)
         # In test browser we can at least replace the option
         self.browser.getControl(
-            name="form.product_options.0.").value = ['First option']
+            name="form.product_options.0.").value = ['First option_99.9_USD']
         self.assertEqual(
             contract.product_options[0].title, 'Any product option')

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -233 +233 @@
 
     def getToken(self, context, value):
-        return value.title
+        return "%s_%s_%s" % (value.title, value.fee, value.currency)
 
     def getTitle(self, context, value):