Changeset 12093 for main/waeup.ikoba/trunk

Timestamp:

30 Nov 2014, 05:55:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Test AppCatProductSource? in browser test.

Location:

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

Files:

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

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

@@ -92 +92 @@
         setSite(app)
 
+        # Add some products
+        self.product = createObject('waeup.Product')
+        self.product.product_id = u'SAM'
+        self.product.title = u'Our Samle Product'
+        self.product.application_category = u'sample'
+        self.app['products'].addProduct(self.product)
+
         # Add customer with subobjects
         customer = createObject('waeup.Customer')
@@ -1105 +1112 @@
 
     def test_edit_sample_application(self):
+        # We add a second product.
+        product = createObject('waeup.Product')
+        product.product_id = u'LIC'
+        product.title = u'Our License Product'
+        product.application_category = u'license'
+        self.app['products'].addProduct(product)
         # Customers can manage applications under certain conditions
         self.browser.open(self.login_path)
@@ -1118 +1131 @@
         self.assertTrue('Sample Application created.' in self.browser.contents)
         application = self.customer['applications']['a102']
-
         # Application can be edited ...
         self.browser.getLink("a102").click()
@@ -1128 +1140 @@
         self.browser.open(self.applications_path + '/a102/edit')
         self.browser.getControl(name="form.title").value = 'My second app'
+        # SAM is in the correct application_category ...
+        self.assertTrue('<option value="SAM">' in self.browser.contents)
+        # ... but NOTSAM not.
+        self.assertFalse('<option value="LIC">' in self.browser.contents)
+        self.browser.getControl(name="form.product").value = ['SAM']
         self.browser.getControl("Save").click()
         self.assertEqual(application.title, 'My second app')

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

@@ -134 +134 @@
         products = grok.getSite()['products'].values()
         if not appcat:
-            return products   # ?????????????????
+            return products
         resultlist = [
             value for value in products if value.application_category == appcat]