svn commit: r1557928 - in /bloodhound/trunk/bloodhound_multiproduct: multiproduct/templates/product_list.html tests/functional/__init__.py tests/functional/admin.py

[rj...@apache.org]

Author: rjollos
Date: Tue Jan 14 04:21:29 2014
New Revision: 1557928

URL: http://svn.apache.org/r1557928
Log:
0.8dev:
 * Added `id` to button on produt list page.
 * `MultiproductFunctionalMixin.create_product` adds a random description if none is specified.

Modified:
    bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_list.html
    bloodhound/trunk/bloodhound_multiproduct/tests/functional/__init__.py
    bloodhound/trunk/bloodhound_multiproduct/tests/functional/admin.py

Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_list.html
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_list.html?rev=1557928&r1=1557927&r2=1557928&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_list.html (original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_list.html Tue Jan 14 04:21:29 2014
@@ -49,7 +49,7 @@
       <div py:if="'PRODUCT_CREATE' in perm" class="btn-group span8">
         <form name="new" method="get" action="${href.products()}">
           <input type="hidden" name="action" value="new" />
-          <input class="btn" type="submit" value="${_('Add new product')}" />
+          <input id="add" class="btn" type="submit" value="${_('Add new product')}" />
         </form>
       </div>
     </div>

Modified: bloodhound/trunk/bloodhound_multiproduct/tests/functional/__init__.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/functional/__init__.py?rev=1557928&r1=1557927&r2=1557928&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/functional/__init__.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/functional/__init__.py Tue Jan 14 04:21:29 2014
@@ -19,17 +19,18 @@
 
 import contextlib
 import imp
-from inspect import isclass
 import os
-from subprocess import call, Popen
 import sys
 import time
-import urllib
 import urllib2
+from inspect import isclass
+from subprocess import call, Popen
 
-from trac.tests.contentgen import random_page, random_sentence, \
-    random_unique_camel, random_word
 from trac.tests import functional
+from trac.tests.contentgen import (
+    random_page, random_paragraph, random_sentence, random_unique_camel,
+    random_word
+)
 from trac.tests.functional.svntestenv import SvnFunctionalTestEnvironment
 from trac.tests.functional.testenv import FunctionalTestEnvironment, ConnectError
 from trac.tests.functional.tester import b, FunctionalTester, internal_error, tc
@@ -735,23 +736,21 @@ class BloodhoundFunctionalTester(Functio
             self.tester.url = self.prev_url 
 
     def create_product(self, prefix=None, name=None, desc=None):
-        products_url = self.url + "/products"
+        products_url = self.url + '/products'
         tc.go(products_url)
         tc.find('Products')
-        # Touch new product form
-        tc.formvalue('new', 'action', 'new')
-        tc.submit('Add new product')
+        tc.submit('add', 'new')
         tc.find('New Product')
 
         prefix = prefix or random_word()
         name = prefix or random_sentence()
+        desc = desc or random_paragraph()
 
         tc.formvalue('edit', 'prefix', prefix)
         tc.formvalue('edit', 'name', name)
-        if desc:
-            tc.formvalue('edit', 'description', desc)
+        tc.formvalue('edit', 'description', desc)
         tc.submit()
-        tc.find('The product "%s" has been added' % (prefix,))
+        tc.find('The product "%s" has been added' % prefix)
         return prefix, name
 
     def go_to_dashboard(self):
@@ -1085,5 +1084,6 @@ def test_suite():
 
     return suite
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

Modified: bloodhound/trunk/bloodhound_multiproduct/tests/functional/admin.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/tests/functional/admin.py?rev=1557928&r1=1557927&r2=1557928&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/tests/functional/admin.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/tests/functional/admin.py Tue Jan 14 04:21:29 2014
@@ -45,11 +45,11 @@ class TestAdminProductDefault(Multiprodu
         tc.go(self._tester.url + '/newticket')
         tc.find('<option selected="selected" value="%s">%s</option>'
                 % (prefix, prefix))
+
         # Test the "Clear default" button
         tc.go(products_url)
         tc.submit('clear', 'product_table')
         tc.notfind('type="radio" name="default" value=".+" checked="checked"')
-        tid = self._tester.create_ticket()
 
 
 class RegressionTestBhTicket667(MultiproductFunctionalTestCase,