details: http://www.bx.psu.edu/hg/galaxy/rev/50c64a663d24 changeset: 2993:50c64a663d24 user: rc date: Mon Nov 09 16:40:59 2009 -0500 description: Fixed some functional tests related to the previous commit diffstat: test/base/twilltestcase.py | 6 +++++- test/functional/test_forms_and_requests.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 8f47f31eb196 -r 50c64a663d24 test/base/twilltestcase.py --- a/test/base/twilltestcase.py Mon Nov 09 16:29:27 2009 -0500 +++ b/test/base/twilltestcase.py Mon Nov 09 16:40:59 2009 -0500 @@ -1263,7 +1263,11 @@ self.check_page_for_string( field_value ) def submit_request( self, request_id, request_name ): self.home() - self.visit_url( "%s/requests/submit_request?id=%i" % ( self.url, request_id )) + self.visit_url( "%s/requests/list?operation=Submit&id=%s" % ( self.url, self.security.encode_id( request_id ) )) + self.check_page_for_string( 'The request <b>%s</b> has been submitted.' % request_name ) + def submit_request_as_admin( self, request_id, request_name ): + self.home() + self.visit_url( "%s/requests_admin/list?operation=Submit&id=%s" % ( self.url, self.security.encode_id( request_id ) )) self.check_page_for_string( 'The request <b>%s</b> has been submitted.' % request_name ) def reject_request( self, request_id, request_name ): self.home() diff -r 8f47f31eb196 -r 50c64a663d24 test/functional/test_forms_and_requests.py --- a/test/functional/test_forms_and_requests.py Mon Nov 09 16:29:27 2009 -0500 +++ b/test/functional/test_forms_and_requests.py Mon Nov 09 16:40:59 2009 -0500 @@ -274,7 +274,7 @@ # add samples to this request self.add_samples( request_two.id, request_two.name, samples ) # submit the request - self.submit_request( request_two.id, request_two.name ) + self.submit_request_as_admin( request_two.id, request_two.name ) sa_session.refresh( request_two ) # check if the request is showing in the 'submitted' filter self.home()